From 0a41574190d4d6ec0411c0bafbcb83c9f6289438 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 12 Mar 2012 14:07:49 +0000
Subject: [PATCH] --- yaml --- r: 305537 b: refs/heads/master c:
 2667b4b8bef8598917adb1b4af46ed2b7d4fa0d7 h: refs/heads/master i:   305535:
 1415f009293bf60fe17086108c9bcf8b74325f41 v: v3

---
 [refs]                     | 2 +-
 trunk/include/sound/soc.h  | 1 +
 trunk/sound/soc/soc-jack.c | 5 +++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 838a758f754d..a4ed7cf36697 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ecd1732f0118f3bc47429ceffa01593ec16c364d
+refs/heads/master: 2667b4b8bef8598917adb1b4af46ed2b7d4fa0d7
diff --git a/trunk/include/sound/soc.h b/trunk/include/sound/soc.h
index 098998743969..b8163ddf94d2 100644
--- a/trunk/include/sound/soc.h
+++ b/trunk/include/sound/soc.h
@@ -518,6 +518,7 @@ struct snd_soc_jack_gpio {
 #endif
 
 struct snd_soc_jack {
+	struct mutex mutex;
 	struct snd_jack *jack;
 	struct snd_soc_codec *codec;
 	struct list_head pins;
diff --git a/trunk/sound/soc/soc-jack.c b/trunk/sound/soc/soc-jack.c
index ee4353f843ea..7f8b3b7428bb 100644
--- a/trunk/sound/soc/soc-jack.c
+++ b/trunk/sound/soc/soc-jack.c
@@ -36,6 +36,7 @@
 int snd_soc_jack_new(struct snd_soc_codec *codec, const char *id, int type,
 		     struct snd_soc_jack *jack)
 {
+	mutex_init(&jack->mutex);
 	jack->codec = codec;
 	INIT_LIST_HEAD(&jack->pins);
 	INIT_LIST_HEAD(&jack->jack_zones);
@@ -75,7 +76,7 @@ void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask)
 	codec = jack->codec;
 	dapm =  &codec->dapm;
 
-	mutex_lock(&codec->mutex);
+	mutex_lock(&jack->mutex);
 
 	oldstatus = jack->status;
 
@@ -109,7 +110,7 @@ void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask)
 	snd_jack_report(jack->jack, jack->status);
 
 out:
-	mutex_unlock(&codec->mutex);
+	mutex_unlock(&jack->mutex);
 }
 EXPORT_SYMBOL_GPL(snd_soc_jack_report);