Commit 1fdf9b49 authored Apr 12, 2011 by Lars-Peter Clausen Committed by Mark Brown Apr 13, 2011

ASoC: codecs: JZ4740: Fix OOPS



Commit ce6120cc(ASoC: Decouple DAPM from CODECs) changed the signature of
snd_soc_dapm_widgets_new to take an pointer to a snd_soc_dapm_context instead of
a snd_soc_codec. The call to snd_soc_dapm_widgets_new in jz4740_codec_dev_probe
was not updated to reflect this change, which results in a compiletime warning
and a runtime OOPS.

Since the core code calls snd_soc_dapm_widgets_new after the codec has been
registered it can be dropped here.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable@kernel.org

parent 39cca168

sound/soc/codecs/jz4740.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -308,8 +308,6 @@ static int jz4740_codec_dev_probe(struct snd_soc_codec *codec)
		snd_soc_dapm_add_routes(dapm, jz4740_codec_dapm_routes,
		ARRAY_SIZE(jz4740_codec_dapm_routes));

		snd_soc_dapm_new_widgets(codec);

		jz4740_codec_set_bias_level(codec, SND_SOC_BIAS_STANDBY);

		return 0;