From: Misael Lopez Cruz Date: Thu, 8 Nov 2012 18:03:12 +0000 (-0600) Subject: ASoC: dapm: Use card_list during DAPM shutdown X-Git-Tag: v3.6.8~56 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c392855dfc4259992947d4a960b57df4c19b71bc;p=karo-tx-linux.git ASoC: dapm: Use card_list during DAPM shutdown commit 445632ad6dda42f4d3f9df2569a852ca0d4ea608 upstream. DAPM shutdown incorrectly uses "list" field of codec struct while iterating over probed components (codec_dev_list). "list" field refers to codecs registered in the system, "card_list" field is used for probed components. Signed-off-by: Misael Lopez Cruz Signed-off-by: Liam Girdwood Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman --- diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index f90139b5f50d..c4a08a2b9612 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -3710,7 +3710,7 @@ void snd_soc_dapm_shutdown(struct snd_soc_card *card) { struct snd_soc_codec *codec; - list_for_each_entry(codec, &card->codec_dev_list, list) { + list_for_each_entry(codec, &card->codec_dev_list, card_list) { soc_dapm_shutdown_codec(&codec->dapm); if (codec->dapm.bias_level == SND_SOC_BIAS_STANDBY) snd_soc_dapm_set_bias_level(&codec->dapm,