Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next

diff --git a/sound/soc/sh/rcar/rsrc-card.c b/sound/soc/sh/rcar/rsrc-card.c
index 8caca2e180c39122d9fcb340d525c04cbfec1817..84e935711e29e4424d560b3381b6357af6b84c00 100644 (file)
--- 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);
 }