Browse Source

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>
Takashi Iwai 14 years ago
parent
commit
f68b3b291d
1 changed files with 2 additions and 1 deletions
  1. 2 1
      sound/pci/hda/patch_conexant.c

+ 2 - 1
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;