From 4d2c8f9c1ce4d39ed40593d9b51d846824d9e6ce Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 19 Oct 2009 16:15:35 +0100
Subject: [PATCH] --- yaml --- r: 170180 b: refs/heads/master c:
 9927f327717400a3372ff8931859509986b8ad37 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index c9a07b2d9eda..2170fe75b1c9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f066173fe8deb8874f41917e5d26ea2e0c46e3b
+refs/heads/master: 9927f327717400a3372ff8931859509986b8ad37
diff --git a/trunk/sound/soc/soc-core.c b/trunk/sound/soc/soc-core.c
index fa0da3cac705..2d190df9fccc 100644
--- a/trunk/sound/soc/soc-core.c
+++ b/trunk/sound/soc/soc-core.c
@@ -795,6 +795,9 @@ static int soc_resume(struct device *dev)
 #define soc_resume	NULL
 #endif
 
+static struct snd_soc_dai_ops null_dai_ops = {
+};
+
 static void snd_soc_instantiate_card(struct snd_soc_card *card)
 {
 	struct platform_device *pdev = container_of(card->dev,
@@ -838,6 +841,11 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card)
 			ac97 = 1;
 	}
 
+	for (i = 0; i < card->num_links; i++) {
+		if (!card->dai_link[i].codec_dai->ops)
+			card->dai_link[i].codec_dai->ops = &null_dai_ops;
+	}
+
 	/* If we have AC97 in the system then don't wait for the
 	 * codec.  This will need revisiting if we have to handle
 	 * systems with mixed AC97 and non-AC97 parts.  Only check for
@@ -2332,9 +2340,6 @@ static int snd_soc_unregister_card(struct snd_soc_card *card)
 	return 0;
 }
 
-static struct snd_soc_dai_ops null_dai_ops = {
-};
-
 /**
  * snd_soc_register_dai - Register a DAI with the ASoC core
  *