aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-jack.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/soc-jack.c')
-rw-r--r--sound/soc/soc-jack.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/soc-jack.c b/sound/soc/soc-jack.c
index ee4353f843ea..7f8b3b7428bb 100644
--- a/sound/soc/soc-jack.c
+++ b/sound/soc/soc-jack.c
@@ -36,6 +36,7 @@
36int snd_soc_jack_new(struct snd_soc_codec *codec, const char *id, int type, 36int snd_soc_jack_new(struct snd_soc_codec *codec, const char *id, int type,
37 struct snd_soc_jack *jack) 37 struct snd_soc_jack *jack)
38{ 38{
39 mutex_init(&jack->mutex);
39 jack->codec = codec; 40 jack->codec = codec;
40 INIT_LIST_HEAD(&jack->pins); 41 INIT_LIST_HEAD(&jack->pins);
41 INIT_LIST_HEAD(&jack->jack_zones); 42 INIT_LIST_HEAD(&jack->jack_zones);
@@ -75,7 +76,7 @@ void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask)
75 codec = jack->codec; 76 codec = jack->codec;
76 dapm = &codec->dapm; 77 dapm = &codec->dapm;
77 78
78 mutex_lock(&codec->mutex); 79 mutex_lock(&jack->mutex);
79 80
80 oldstatus = jack->status; 81 oldstatus = jack->status;
81 82
@@ -109,7 +110,7 @@ void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask)
109 snd_jack_report(jack->jack, jack->status); 110 snd_jack_report(jack->jack, jack->status);
110 111
111out: 112out:
112 mutex_unlock(&codec->mutex); 113 mutex_unlock(&jack->mutex);
113} 114}
114EXPORT_SYMBOL_GPL(snd_soc_jack_report); 115EXPORT_SYMBOL_GPL(snd_soc_jack_report);
115 116