aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2015-09-14 22:44:37 -0400
committerMark Brown <broonie@kernel.org>2015-09-16 15:40:39 -0400
commit462c30bc8b3457e2904c45babf4cb06c3b38ed4e (patch)
treeed1fb09586ffec9c2d2de3671049149f44bede4b
parente2f8445176c9e6e6b152b792d08abca8308bb8ff (diff)
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 <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/sh/rcar/adg.c2
1 files changed, 1 insertions, 1 deletions
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,
532 * for clkout 532 * for clkout
533 */ 533 */
534 if (!count) { 534 if (!count) {
535 clk = clk_register_fixed_rate(dev, clkout_name[i], 535 clk = clk_register_fixed_rate(dev, clkout_name[CLKOUT],
536 parent_clk_name, 536 parent_clk_name,
537 (parent_clk_name) ? 537 (parent_clk_name) ?
538 0 : CLK_IS_ROOT, req_rate); 538 0 : CLK_IS_ROOT, req_rate);