ASoC: rsnd: don't call update callback if it was NULL

morimoto · gregkh · commit 4ec0b2c2d235 · 2017-08-30T10:19:28.000+02:00
commit d7289565483c65094d0473555625a4acd89567d3 upstream.

Signed-off-by: Kuninori Morimoto &lt;kuninori.morimoto.gx@renesas.com&gt;
Signed-off-by: Mark Brown &lt;broonie@kernel.org&gt;
Signed-off-by: Thong Ho &lt;thong.ho.px@rvc.renesas.com&gt;
Signed-off-by: Nhan Nguyen &lt;nhan.nguyen.yb@renesas.com&gt;
Signed-off-by: Greg Kroah-Hartman &lt;gregkh@linuxfoundation.org&gt;
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
@@ -1016,7 +1016,7 @@ static int rsnd_kctrl_put(struct snd_kcontrol *kctrl,
 		}
 	}
 
-	if (change)
+	if (change && cfg->update)
 		cfg->update(cfg->io, mod);
 
 	return change;

Original file line number	Diff line number	Diff line change
`@@ -1016,7 +1016,7 @@ static int rsnd_kctrl_put(struct snd_kcontrol *kctrl,`
`1016`	`1016`	`}`
`1017`	`1017`	`}`
`1018`	`1018`
`1019`		`- if (change)`
	`1019`	`+ if (change && cfg->update)`
`1020`	`1020`	`cfg->update(cfg->io, mod);`
`1021`	`1021`
`1022`	`1022`	`return change;`