From 19b78f6a96eb7a3ce8aaae1013d16ce40bf35b1a Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Mon, 6 Dec 2010 16:48:03 +0800
Subject: [PATCH] --- yaml --- r: 223108 b: refs/heads/master c:
 1dcb4f38e5bc28dfce0f8c7eef184a090b03bfc7 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 3e1a91cf64fa..62e0f1b24b2f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ed8cc471d75365f8590c76f580def899d58028c0
+refs/heads/master: 1dcb4f38e5bc28dfce0f8c7eef184a090b03bfc7
diff --git a/trunk/sound/soc/soc-core.c b/trunk/sound/soc/soc-core.c
index 441285ade024..02ae7bea3b50 100644
--- a/trunk/sound/soc/soc-core.c
+++ b/trunk/sound/soc/soc-core.c
@@ -3072,7 +3072,9 @@ int snd_soc_register_dais(struct device *dev,
 		pr_debug("Registered DAI '%s'\n", dai->name);
 	}
 
+	mutex_lock(&client_mutex);
 	snd_soc_instantiate_cards();
+	mutex_unlock(&client_mutex);
 	return 0;
 
 err: