aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/sh/rcar/adg.c
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2015-09-15 02:44:37 +0000
committerMark Brown <broonie@kernel.org>2015-09-16 20:40:39 +0100
commit462c30bc8b3457e2904c45babf4cb06c3b38ed4e (patch)
treeed1fb09586ffec9c2d2de3671049149f44bede4b /sound/soc/sh/rcar/adg.c
parentASoC: rsnd: SND_SOC_RCAR depends on COMMON_CLK (diff)
downloadlinux-dev-462c30bc8b3457e2904c45babf4cb06c3b38ed4e.tar.xz
linux-dev-462c30bc8b3457e2904c45babf4cb06c3b38ed4e.zip
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>
Diffstat (limited to 'sound/soc/sh/rcar/adg.c')
-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,
* 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);