From: Kuninori Morimoto Date: Tue, 15 Sep 2015 02:44:37 +0000 (+0000) Subject: ASoC: rsnd: fixup clkout_name[] index error for single AUDIO_CLKOUT SoC X-Git-Tag: firefly_0821_release~176^2~581^2~9^2^4~5^2~12 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=462c30bc8b3457e2904c45babf4cb06c3b38ed4e;p=firefly-linux-kernel-4.4.55.git ASoC: rsnd: fixup clkout_name[] index error for single AUDIO_CLKOUT SoC 2a46db4a3("ASoC: rsnd: add AUDIO_CLKOUT support") added AUDIO_CLKOUT support for ADG. But single AUDIO_CLKOUT needs clkout_name[CLKOUT], not clkout_name[i]. Kernel will have NULL pointer access without this patch. Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown --- diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c index 3fecb87f45ba..c4ebbb7a7b6f 100644 --- a/sound/soc/sh/rcar/adg.c +++ b/sound/soc/sh/rcar/adg.c @@ -532,7 +532,7 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv, * for clkout */ if (!count) { - clk = clk_register_fixed_rate(dev, clkout_name[i], + clk = clk_register_fixed_rate(dev, clkout_name[CLKOUT], parent_clk_name, (parent_clk_name) ? 0 : CLK_IS_ROOT, req_rate);