---

yaml --- r: 342553 b: refs/heads/master c: 34a9318 h: refs/heads/master i: 342551: bbc02d6 v: v3
git-mirror · Oct 17, 2012 · c4975e3 · c4975e3
1 parent d391a8a
commit c4975e3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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);