From 1154bd078678623e63d7f153be9eaa96061bd423 Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Sat, 17 Oct 2009 08:32:56 +0200
Subject: [PATCH] --- yaml --- r: 170179 b: refs/heads/master c:
 4f066173fe8deb8874f41917e5d26ea2e0c46e3b h: refs/heads/master i:   170177:
 99dd109dc714de40a07aa913839bb9201f9f4f73   170175:
 b0a3c5ee12bae0db785883c8d2bb214ab45ff6a2 v: v3

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

diff --git a/[refs] b/[refs]
index 399bcc2aa4bf..c9a07b2d9eda 100644
--- 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
index 1d455ab79490..12124149601e 100644
--- 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);