OSDN Git Service

ASoC: rsnd: fixup clkout_name[] index error for single AUDIO_CLKOUT SoC
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tue, 15 Sep 2015 02:44:37 +0000 (02:44 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 16 Sep 2015 19:40:39 +0000 (20:40 +0100)
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>
sound/soc/sh/rcar/adg.c

index 3fecb87..c4ebbb7 100644 (file)
@@ -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);