diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-05-17 12:57:46 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-05-17 12:57:46 +0200 |
| commit | b55fcb508dfc9f00056beb33d4c466bc9032dd05 (patch) | |
| tree | 2dcc92c2f0533c9b999bb8699d02a540633f2367 /sound/pci/hda | |
| parent | 1f83ac5ac9fb3e8b2e053de380f55ba412228577 (diff) | |
| download | lwn-b55fcb508dfc9f00056beb33d4c466bc9032dd05.tar.gz lwn-b55fcb508dfc9f00056beb33d4c466bc9032dd05.zip | |
ALSA: hda - Handle dock line-in as auto-detecable for Cxt auto-parser
Similar process like in patch_realtek.c and patch_sigmatel.c.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda')
| -rw-r--r-- | sound/pci/hda/patch_conexant.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index 2a04fea01692..4f37477d3c71 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c @@ -3794,17 +3794,19 @@ static void cx_auto_check_auto_mic(struct hda_codec *codec) for (i = 0; i < spec->private_imux.num_items; i++) { hda_nid_t pin = spec->imux_info[i].pin; unsigned int def_conf = snd_hda_codec_get_pincfg(codec, pin); - int attr; - if (get_defcfg_device(def_conf) != AC_JACK_MIC_IN) - return; /* no-mic input */ + int type, attr; attr = snd_hda_get_input_pin_attr(def_conf); if (attr == INPUT_PIN_ATTR_UNUSED) - continue; + return; /* invalid entry */ if (attr > INPUT_PIN_ATTR_NORMAL) attr = INPUT_PIN_ATTR_NORMAL; if (attr != INPUT_PIN_ATTR_INT && !is_jack_detectable(codec, pin)) - continue; + return; /* non-detectable pin */ + type = get_defcfg_device(def_conf); + if (type != AC_JACK_MIC_IN && + (attr != INPUT_PIN_ATTR_DOCK || type != AC_JACK_LINE_IN)) + return; /* no valid input type */ if (pset[attr] >= 0) return; /* already occupied */ pset[attr] = i; |