diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-06-22 13:25:34 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-06-22 13:25:34 +0200 |
| commit | c7988afde761cdb571b4e9e8d2ee741dea4b5389 (patch) | |
| tree | 700cf9b74faa645803744141031ad0d07a3fa423 /sound/soc/sh/rcar/rsrc-card.c | |
| parent | 57fa8a1e22c5833fb2cae96af68fc39ec21cb017 (diff) | |
| parent | f76b240206156f1d57869cc60264a128d6b6ed2f (diff) | |
Merge tag 'asoc-v4.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: A couple more updates for v4.2
These were sitting on my laptop.
Diffstat (limited to 'sound/soc/sh/rcar/rsrc-card.c')
| -rw-r--r-- | sound/soc/sh/rcar/rsrc-card.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/sh/rcar/rsrc-card.c b/sound/soc/sh/rcar/rsrc-card.c index 8caca2e180c3..84e935711e29 100644 --- a/sound/soc/sh/rcar/rsrc-card.c +++ b/sound/soc/sh/rcar/rsrc-card.c @@ -75,8 +75,6 @@ static int rsrc_card_startup(struct snd_pcm_substream *substream) struct rsrc_card_priv *priv = snd_soc_card_get_drvdata(rtd->card); struct rsrc_card_dai *dai_props = rsrc_priv_to_props(priv, rtd - rtd->card->rtd); - int ret; - return clk_prepare_enable(dai_props->clk); } |