[alsa-devel] [PATCH 1/2] ASoC: codecs: JZ4740: Fix OOPS

Lars-Peter Clausen lars at metafoo.de
Tue Apr 12 19:33:28 CEST 2011

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 at metafoo.de>
 sound/soc/codecs/jz4740.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/sound/soc/codecs/jz4740.c b/sound/soc/codecs/jz4740.c
index f7cd346..f5ccdbf7 100644
--- a/sound/soc/codecs/jz4740.c
+++ b/sound/soc/codecs/jz4740.c
@@ -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,
-	snd_soc_dapm_new_widgets(codec);
 	jz4740_codec_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 	return 0;

More information about the Alsa-devel mailing list