aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMisael Lopez Cruz <misael.lopez@ti.com>2012-11-08 12:03:12 -0600
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-26 11:34:34 -0800
commitbb71076311ea0990cf8989aa13909191801acea2 (patch)
treedcc7dde8dfb8e680efbeda7feb75144e09eb0df1
parentdd5df62c48044800a9a1e0d783b024f3c6654548 (diff)
downloadkernel_samsung_aries-bb71076311ea0990cf8989aa13909191801acea2.zip
kernel_samsung_aries-bb71076311ea0990cf8989aa13909191801acea2.tar.gz
kernel_samsung_aries-bb71076311ea0990cf8989aa13909191801acea2.tar.bz2
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 <misael.lopez@ti.com> Signed-off-by: Liam Girdwood <lrg@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--sound/soc/soc-dapm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index d5ec206..0c9dee2 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -2634,7 +2634,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,