1 files changed, 15 insertions, 3 deletions

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 36519aef55d9..92d5d917b73b 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -116,6 +116,7 @@ static int soc_ac97_dev_register(struct snd_soc_codec *codec)
 static inline const char* get_dai_name(int type)
 {
         switch(type) {
+        case SND_SOC_DAI_AC97_BUS:
         case SND_SOC_DAI_AC97:
                 return "AC97";
         case SND_SOC_DAI_I2S:
@@ -1099,7 +1100,8 @@ int snd_soc_register_card(struct snd_soc_device *socdev)
                                 continue;
                         }
                 }
-                if (socdev->machine->dai_link[i].cpu_dai->type == SND_SOC_DAI_AC97)
+                if (socdev->machine->dai_link[i].codec_dai->type == 
+                        SND_SOC_DAI_AC97_BUS)
                         ac97 = 1;
         }
         snprintf(codec->card->shortname, sizeof(codec->card->shortname),
@@ -1148,11 +1150,21 @@ EXPORT_SYMBOL_GPL(snd_soc_register_card);
 void snd_soc_free_pcms(struct snd_soc_device *socdev)
 {
         struct snd_soc_codec *codec = socdev->codec;
+#ifdef CONFIG_SND_SOC_AC97_BUS
+        struct snd_soc_codec_dai *codec_dai;
+        int i;
+#endif
 
         mutex_lock(&codec->mutex);
 #ifdef CONFIG_SND_SOC_AC97_BUS
-        if (codec->ac97)
-                soc_ac97_dev_unregister(codec);
+        for(i = 0; i < codec->num_dai; i++) {
+                codec_dai = &codec->dai[i];
+                if (codec_dai->type == SND_SOC_DAI_AC97_BUS && codec->ac97) {
+                        soc_ac97_dev_unregister(codec);
+                        goto free_card;
+                }
+        }
+free_card:
 #endif
 
         if (codec->card)