---

yaml --- r: 293490 b: refs/heads/master c: cc22d37 h: refs/heads/master v: v3
git-mirror · Mar 6, 2012 · af1f20d · af1f20d
1 parent 58bbe9b
commit af1f20d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c25cd1543986e7c16c7ddf738748ccd530a18268
+refs/heads/master: cc22d37e7f5e1745658760660f03793913f43e49
diff --git a/trunk/include/sound/soc.h b/trunk/include/sound/soc.h
@@ -718,6 +718,7 @@ struct snd_soc_platform {
 	int id;
 	struct device *dev;
 	struct snd_soc_platform_driver *driver;
+	struct mutex mutex;
 
 	unsigned int suspended:1; /* platform is suspended */
 	unsigned int probed:1;

diff --git a/trunk/sound/soc/soc-core.c b/trunk/sound/soc/soc-core.c
@@ -3382,6 +3382,7 @@ int snd_soc_register_platform(struct device *dev,
 	platform->dapm.dev = dev;
 	platform->dapm.platform = platform;
 	platform->dapm.stream_event = platform_drv->stream_event;
+	mutex_init(&platform->mutex);
 
 	mutex_lock(&client_mutex);
 	list_add(&platform->list, &platform_list);