---

yaml --- r: 305585 b: refs/heads/master c: 149c53b h: refs/heads/master i: 305583: 9f51c21 v: v3
git-mirror · Apr 4, 2012 · 823544b · 823544b
1 parent 550be80
commit 823544b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41b5b3bd5b7c9dd4ab4e0583d54d81b7f7d33d1f
+refs/heads/master: 149c53b514d0a42abbb2c9611ffc9fa2d94857e8
diff --git a/trunk/sound/soc/codecs/wm8994.c b/trunk/sound/soc/codecs/wm8994.c
@@ -686,6 +686,9 @@ static void wm1811_jackdet_set_mode(struct snd_soc_codec *codec, u16 mode)
 {
 	struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
 
+	if (!wm8994->jackdet || !wm8994->jack_cb)
+		return;
+
 	if (!wm8994->jackdet || !wm8994->jack_cb)
 		return;
-Original file line number
+Diff line change
@@ Expand Up @@
     {
     	struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
+    	if (!wm8994->jackdet || !wm8994->jack_cb)
+    		return;
     	if (!wm8994->jackdet || !wm8994->jack_cb)
     		return;
@@ Expand Down @@