summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-05-13 16:18:37 +0200
committerTakashi Iwai <tiwai@suse.de>2011-05-13 16:18:37 +0200
commit2557f7427d4bd1fc00166556e3047c5f3ed91958 (patch)
tree7edab5b0abbca9c8ea9fa9fe7ec6d8edf0f066e1 /sound
parent447ee6a7cbbfb5ae7ab8f9b8b058b4a04fe398bf (diff)
downloadblackbird-op-linux-2557f7427d4bd1fc00166556e3047c5f3ed91958.tar.gz
blackbird-op-linux-2557f7427d4bd1fc00166556e3047c5f3ed91958.zip
ALSA: hda - Fix auto-mic for CX2064x codecs
The wrong id is assigned for external/internal mics in the auto-mic selection parser. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/patch_conexant.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index 35bebe59908d..eecc154d0b63 100644
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -3420,13 +3420,13 @@ static void cx_auto_check_auto_mic(struct hda_codec *codec)
if (is_ext_mic(codec, cfg->inputs[0].pin) &&
is_int_mic(codec, cfg->inputs[1].pin)) {
spec->auto_mic = 1;
- spec->auto_mic_ext = 1;
+ spec->auto_mic_ext = 0;
return;
}
- if (is_int_mic(codec, cfg->inputs[1].pin) &&
- is_ext_mic(codec, cfg->inputs[0].pin)) {
+ if (is_int_mic(codec, cfg->inputs[0].pin) &&
+ is_ext_mic(codec, cfg->inputs[1].pin)) {
spec->auto_mic = 1;
- spec->auto_mic_ext = 0;
+ spec->auto_mic_ext = 1;
return;
}
}
OpenPOWER on IntegriCloud