diff options
| author | Misael Lopez Cruz <misael.lopez@ti.com> | 2012-11-08 12:03:12 -0600 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-26 11:37:43 -0800 |
| commit | 647a9dbec6ab9bf9789b2dcfb589cf4dbb13e379 (patch) | |
| tree | 8be69669553358b5dcc975ebef767ee8902b42de /sound | |
| parent | b6d806539cdf76b1d0ad2411dff4cae227de4942 (diff) | |
| download | linux-3.10-647a9dbec6ab9bf9789b2dcfb589cf4dbb13e379.tar.gz linux-3.10-647a9dbec6ab9bf9789b2dcfb589cf4dbb13e379.tar.bz2 linux-3.10-647a9dbec6ab9bf9789b2dcfb589cf4dbb13e379.zip | |
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>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-dapm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index c41efe01a81..9ae82a4eb71 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -3253,7 +3253,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, |