summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-01-07 12:11:33 +0100
committerTakashi Iwai <tiwai@suse.de>2013-01-12 08:43:54 +0100
commit76a19c69d9c971d652e263799536412ec7f8dcf3 (patch)
treec6d10816721da62555e023cfd0814449002bf62c
parente6b85f3c9d5ea3807dee651c28d5b0d5982ae2fa (diff)
downloadtalos-op-linux-76a19c69d9c971d652e263799536412ec7f8dcf3.tar.gz
talos-op-linux-76a19c69d9c971d652e263799536412ec7f8dcf3.zip
ALSA: hda - Allow jack detection when polling is enabled
Let is_jack_detectable() return true when the jack polling is enabled for the codec. VT1708 uses the polling explicitly so we need to allow it. Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/pci/hda/hda_jack.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_jack.c b/sound/pci/hda/hda_jack.c
index 6479b6501828..1d035efeff4f 100644
--- a/sound/pci/hda/hda_jack.c
+++ b/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;
}
OpenPOWER on IntegriCloud