---

yaml --- r: 353095 b: refs/heads/master c: 76a19c6 h: refs/heads/master i: 353093: 89e2787 353091: d68f0b7 353087: d767105 v: v3
git-mirror · Jan 12, 2013 · 16a67a4 · 16a67a4
1 parent 779aeb7
commit 16a67a4
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: e6b85f3c9d5ea3807dee651c28d5b0d5982ae2fa
+refs/heads/master: 76a19c69d9c971d652e263799536412ec7f8dcf3
diff --git a/trunk/sound/pci/hda/hda_jack.c b/trunk/sound/pci/hda/hda_jack.c
@@ -29,7 +29,8 @@ bool is_jack_detectable(struct hda_codec *codec, hda_nid_t nid)
 	if (get_defcfg_misc(snd_hda_codec_get_pincfg(codec, nid)) &
 	     AC_DEFCFG_MISC_NO_PRESENCE)
 		return false;
-	if (!(get_wcaps(codec, nid) & AC_WCAP_UNSOL_CAP))
+	if (!(get_wcaps(codec, nid) & AC_WCAP_UNSOL_CAP) &&
+	    !codec->jackpoll_interval)
 		return false;
 	return true;
 }