From 3464b8cfbcb96df993552632a30c147791c4c248 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 29 Mar 2010 20:31:14 +0100
Subject: [PATCH] --- yaml --- r: 193406 b: refs/heads/master c:
 3a278a0c65c924950c4744ba451a110998998044 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 2f4d0f6e2130..1fd5f42def26 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba0a24e7387bb56425da07ed858ada37896ed36a
+refs/heads/master: 3a278a0c65c924950c4744ba451a110998998044
diff --git a/trunk/sound/soc/soc-jack.c b/trunk/sound/soc/soc-jack.c
index f8fd22cc70bc..29159e1781d0 100644
--- a/trunk/sound/soc/soc-jack.c
+++ b/trunk/sound/soc/soc-jack.c
@@ -64,10 +64,9 @@ void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask)
 	int enable;
 	int oldstatus;
 
-	if (!jack) {
-		WARN_ON_ONCE(!jack);
+	if (!jack)
 		return;
-	}
+
 	codec = jack->card->codec;
 
 	mutex_lock(&codec->mutex);