From caaaa9116e1f836f0a30e3ef1db8d0ea58fc0a16 Mon Sep 17 00:00:00 2001
From: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Date: Mon, 16 Mar 2009 23:26:20 +0900
Subject: [PATCH] --- yaml --- r: 132928 b: refs/heads/master c:
 d2314e0e27566f8830ebed3587cc049e07e6a4ee h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/sound/soc/soc-core.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a27f676ac2d3..fa076ece35c3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 852fd9e50f62b4ea7afe26eee0710464de4801b8
+refs/heads/master: d2314e0e27566f8830ebed3587cc049e07e6a4ee
diff --git a/trunk/sound/soc/soc-core.c b/trunk/sound/soc/soc-core.c
index 16518329f6b2..6e710f705a74 100644
--- a/trunk/sound/soc/soc-core.c
+++ b/trunk/sound/soc/soc-core.c
@@ -1432,7 +1432,8 @@ void snd_soc_free_pcms(struct snd_soc_device *socdev)
 #ifdef CONFIG_SND_SOC_AC97_BUS
 	for (i = 0; i < codec->num_dai; i++) {
 		codec_dai = &codec->dai[i];
-		if (codec_dai->ac97_control && codec->ac97) {
+		if (codec_dai->ac97_control && codec->ac97 &&
+		    strcmp(codec->name, "AC97") != 0) {
 			soc_ac97_dev_unregister(codec);
 			goto free_card;
 		}