summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-11-27 20:38:34 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-11-27 20:45:36 +0100
commitb05d8dc15f346224306bda4b4ae39fc5ace74ee6 (patch)
tree339f9baf7253ce201c240b5a63d1c479557501af /sound/soc
parentMerge branch 'for-3.2' into for-3.3 (diff)
downloadlinux-b05d8dc15f346224306bda4b4ae39fc5ace74ee6.tar.xz
linux-b05d8dc15f346224306bda4b4ae39fc5ace74ee6.zip
ASoC: Fix CODEC enumeration for auto_nc_codec_pins
We need to enumerate all the CODECs that are part of the card we're instantiating, not all the CODECs that are in the system as the system may have multiple cards. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/soc-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 2abaf6dcdb0a..ec783f0a27e9 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1489,7 +1489,7 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card)
snd_soc_dapm_new_widgets(&card->dapm);
if (card->fully_routed)
- list_for_each_entry(codec, &codec_list, list)
+ list_for_each_entry(codec, &card->codec_dev_list, card_list)
snd_soc_dapm_auto_nc_codec_pins(codec);
ret = snd_card_register(card->snd_card);