Commit f68b3b29 authored by Takashi Iwai's avatar Takashi Iwai

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: default avatarTakashi Iwai <tiwai@suse.de>
parent 99ae28be
...@@ -3475,7 +3475,8 @@ static int is_ext_mic(struct hda_codec *codec, hda_nid_t pin) ...@@ -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); unsigned int def_conf = snd_hda_codec_get_pincfg(codec, pin);
return get_defcfg_device(def_conf) == AC_JACK_MIC_IN && 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; /* check whether the pin config is suitable for auto-mic switching;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment