[ 28/83] ASoC: dapm: Use card_list during DAPM shutdown
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: 2012-11-22 18:33:39
Also in:
lkml
3.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Misael Lopez Cruz <redacted> 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 <redacted> Signed-off-by: Liam Girdwood <redacted> Signed-off-by: Mark Brown <redacted> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- sound/soc/soc-dapm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c@@ -3710,7 +3710,7 @@ void snd_soc_dapm_shutdown(struct snd_so { 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,