---

yaml --- r: 170179 b: refs/heads/master c: 4f06617 h: refs/heads/master i: 170177: 99dd109 170175: b0a3c5e v: v3
git-mirror · Oct 19, 2009 · 1154bd0 · 1154bd0
1 parent a6e9892
commit 1154bd0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d567b6b441bfcc20e8cbebc0dc376b2e280cd88
+refs/heads/master: 4f066173fe8deb8874f41917e5d26ea2e0c46e3b
diff --git a/trunk/sound/soc/soc-jack.c b/trunk/sound/soc/soc-jack.c
@@ -58,7 +58,7 @@ EXPORT_SYMBOL_GPL(snd_soc_jack_new);
  */
 void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask)
 {
-	struct snd_soc_codec *codec = jack->card->codec;
+	struct snd_soc_codec *codec;
 	struct snd_soc_jack_pin *pin;
 	int enable;
 	int oldstatus;
@@ -67,6 +67,7 @@ void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask)
 		WARN_ON_ONCE(!jack);
 		return;
 	}
+	codec = jack->card->codec;
 
 	mutex_lock(&codec->mutex);