diff options
| author | Mark Brown <broonie@kernel.org> | 2015-06-22 11:19:46 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-06-22 11:19:46 +0100 |
| commit | f76b240206156f1d57869cc60264a128d6b6ed2f (patch) | |
| tree | 082ac691cfdcac23e38460ce61e5dad35354a230 /sound/soc | |
| parent | 6791142f41dc3a92a589f66c0af2db7e5fd572a1 (diff) | |
| parent | 329d0c0cf1be0ad711bc2f9853fdacc33c1f72b4 (diff) | |
| download | linux-f76b240206156f1d57869cc60264a128d6b6ed2f.tar.bz2 | |
Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next
Diffstat (limited to 'sound/soc')
| -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); } |