summaryrefslogtreecommitdiff
path: root/sound/pci
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-08-24 10:53:10 +0200
committerTakashi Iwai <tiwai@suse.de>2011-08-24 10:53:10 +0200
commit7675535958175b85b8117bcee245d9ecbc4d3d74 (patch)
tree7f8d404c144374e885222cef702e5f6961edec2f /sound/pci
parent1f015f5fdc4003f3f2a7c66efdb1acf7a2d230bf (diff)
downloadlinux-3.10-7675535958175b85b8117bcee245d9ecbc4d3d74.tar.gz
linux-3.10-7675535958175b85b8117bcee245d9ecbc4d3d74.tar.bz2
linux-3.10-7675535958175b85b8117bcee245d9ecbc4d3d74.zip
ALSA: hda/conexant - Enable ADC-switching for auto-mic mode, too
The ADC-switching can work also in the auto-mic mode, too. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/hda/patch_conexant.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index 4c462c3d646..5616444a8ed 100644
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -3866,7 +3866,7 @@ static void cx_auto_parse_input(struct hda_codec *codec)
}
if (imux->num_items >= 2 && cfg->num_inputs == imux->num_items)
cx_auto_check_auto_mic(codec);
- if (imux->num_items > 1 && !spec->auto_mic) {
+ if (imux->num_items > 1) {
for (i = 1; i < imux->num_items; i++) {
if (spec->imux_info[i].adc != spec->imux_info[0].adc) {
spec->adc_switching = 1;