From 16a67a455c8c9c8c5ac8d3309014e74964e9e943 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 7 Jan 2013 12:11:33 +0100 Subject: [PATCH] --- yaml --- r: 353095 b: refs/heads/master c: 76a19c69d9c971d652e263799536412ec7f8dcf3 h: refs/heads/master i: 353093: 89e27879badf715353bd295fd5722387f2a7ae3c 353091: d68f0b71e09110b27c2a487ca7088a78b8f44306 353087: d7671055a1fb35f13504a41f6b8dd2e93e47cef8 v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/hda_jack.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9f07b8202548..28c0e851c522 100644 --- 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 index 6479b6501828..1d035efeff4f 100644 --- 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; }