aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-09-17 14:45:14 +0200
committerTakashi Iwai <tiwai@suse.de>2010-09-17 14:45:14 +0200
commitf68b3b291d39f1e3361b194a95459f9cbdaf31e6 (patch)
tree196085800ba3c2c989b89d17161eb8172a01285d
parent99ae28bea984df4c38234eb6d2f29a552def6c1b (diff)
downloadkernel_samsung_aries-f68b3b291d39f1e3361b194a95459f9cbdaf31e6.zip
kernel_samsung_aries-f68b3b291d39f1e3361b194a95459f9cbdaf31e6.tar.gz
kernel_samsung_aries-f68b3b291d39f1e3361b194a95459f9cbdaf31e6.tar.bz2
ALSA: hda - Check the external mic pin more strictly for Conexant chips
The external mic jack for auto-mic switch must be really an external jack and with a presense-detection capability. This patch makes the check more paranoia. Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/pci/hda/patch_conexant.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index 09d573c..a6c68cb 100644
--- a/sound/pci/hda/patch_conexant.c
+++ b/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;