From da299e9ff4fcff816fa46ae5cf90d72242b82be1 Mon Sep 17 00:00:00 2001
From: Barry Song <21cnbao@gmail.com>
Date: Thu, 12 Nov 2009 12:01:47 +0800
Subject: [PATCH] --- yaml --- r: 170227 b: refs/heads/master c:
 f773205300fa4a5a405f8ed6e3bb97e46c6eefb4 h: refs/heads/master i:   170225:
 257253c070af3e834cc1db1501d0d7d8ca2963a8   170223:
 cd24121129cb9751d2b1ffb3f03c54bdcf291763 v: v3

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

diff --git a/[refs] b/[refs]
index e425a7ba130c..fc27362d91e9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba2b87f5a93659a28cc4fb812ccd7b4146ac3aa9
+refs/heads/master: f773205300fa4a5a405f8ed6e3bb97e46c6eefb4
diff --git a/trunk/sound/soc/soc-core.c b/trunk/sound/soc/soc-core.c
index e2b6d75f16e3..ef8f28284cb9 100644
--- a/trunk/sound/soc/soc-core.c
+++ b/trunk/sound/soc/soc-core.c
@@ -1083,11 +1083,8 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card)
 				continue;
 			}
 		}
-		if (card->dai_link[i].codec_dai->ac97_control) {
+		if (card->dai_link[i].codec_dai->ac97_control)
 			ac97 = 1;
-			snd_ac97_dev_add_pdata(codec->ac97,
-				card->dai_link[i].cpu_dai->ac97_pdata);
-		}
 	}
 
 	snprintf(codec->card->shortname, sizeof(codec->card->shortname),
@@ -1510,6 +1507,10 @@ int snd_soc_new_pcms(struct snd_soc_device *socdev, int idx, const char *xid)
 			mutex_unlock(&codec->mutex);
 			return ret;
 		}
+		if (card->dai_link[i].codec_dai->ac97_control) {
+			snd_ac97_dev_add_pdata(codec->ac97,
+				card->dai_link[i].cpu_dai->ac97_pdata);
+		}
 	}
 
 	mutex_unlock(&codec->mutex);