Skip to content

Commit

Permalink
ASoC: codecs: JZ4740: Fix OOPS
Browse files Browse the repository at this point in the history
Commit ce6120c(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
  • Loading branch information
Lars-Peter Clausen authored and Mark Brown committed Apr 13, 2011
1 parent 39cca16 commit 1fdf9b4
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions sound/soc/codecs/jz4740.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 1fdf9b4

Please sign in to comment.