Merge branch 'for-3.2' into for-3.3

[karo-tx-linux.git] / sound / soc / soc-core.c

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 2abaf6dcdb0ac06b750231982bf3c06e665b875d..5195f0653b35323d39edd80e3cfd52801a700177 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -572,7 +572,7 @@ int snd_soc_suspend(struct device *dev)
                        switch (codec->dapm.bias_level) {
                        case SND_SOC_BIAS_STANDBY:
                        case SND_SOC_BIAS_OFF:
-                               codec->driver->suspend(codec, PMSG_SUSPEND);
+                               codec->driver->suspend(codec);
                                codec->suspended = 1;
                                codec->cache_sync = 1;
                                break;
@@ -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);