From 6bf8b160c4956128df2d01dd34d694a30938182e Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Fri, 17 Sep 2010 14:45:14 +0200 Subject: [PATCH] --- yaml --- r: 216699 b: refs/heads/master c: f68b3b291d39f1e3361b194a95459f9cbdaf31e6 h: refs/heads/master i: 216697: 177ab397f07bd9c9c6dd80009b642d14c74cd084 216695: b03226883b00a06aefa0bace5f891f2f7c8359b7 v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/patch_conexant.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3dfe6ad975e8..6a460039fa7f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 99ae28bea984df4c38234eb6d2f29a552def6c1b +refs/heads/master: f68b3b291d39f1e3361b194a95459f9cbdaf31e6 diff --git a/trunk/sound/pci/hda/patch_conexant.c b/trunk/sound/pci/hda/patch_conexant.c index 09d573c59bef..a6c68cb06ddb 100644 --- a/trunk/sound/pci/hda/patch_conexant.c +++ b/trunk/sound/pci/hda/patch_conexant.c @@ -3475,7 +3475,8 @@ static int is_ext_mic(struct hda_codec *codec, hda_nid_t pin) { unsigned int def_conf = snd_hda_codec_get_pincfg(codec, pin); return get_defcfg_device(def_conf) == AC_JACK_MIC_IN && - snd_hda_get_input_pin_attr(def_conf) != INPUT_PIN_ATTR_INT; + snd_hda_get_input_pin_attr(def_conf) >= INPUT_PIN_ATTR_NORMAL && + (snd_hda_query_pin_caps(codec, pin) & AC_PINCAP_PRES_DETECT); } /* check whether the pin config is suitable for auto-mic switching;