From c4975e3865fe64a4602bf4e18aac05282f19ea45 Mon Sep 17 00:00:00 2001
From: David Henningsson <david.henningsson@canonical.com>
Date: Wed, 17 Oct 2012 14:45:05 +0200
Subject: [PATCH] --- yaml --- r: 342553 b: refs/heads/master c:
 34a9318772d00efc5c1af00639526232050c49b8 h: refs/heads/master i:   342551:
 bbc02d63e9178542a65893e68b1de5d187057e24 v: v3

---
 [refs]                         | 2 +-
 trunk/sound/pci/hda/hda_jack.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7f2e34966207..bc288b461d5e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a2af050f8df6eeec29818639859f14eb237d6957
+refs/heads/master: 34a9318772d00efc5c1af00639526232050c49b8
diff --git a/trunk/sound/pci/hda/hda_jack.c b/trunk/sound/pci/hda/hda_jack.c
index 07d5288ce8cf..5bdbadaa20fe 100644
--- a/trunk/sound/pci/hda/hda_jack.c
+++ b/trunk/sound/pci/hda/hda_jack.c
@@ -206,6 +206,8 @@ int snd_hda_jack_detect_enable_callback(struct hda_codec *codec, hda_nid_t nid,
 		jack->action = action;
 	if (cb)
 		jack->callback = cb;
+	if (codec->jackpoll_interval > 0)
+		return 0; /* No unsol if we're polling instead */
 	return snd_hda_codec_write_cache(codec, nid, 0,
 					 AC_VERB_SET_UNSOLICITED_ENABLE,
 					 AC_USRSP_EN | jack->tag);