aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-11-23 07:39:58 +0100
committerTakashi Iwai <tiwai@suse.de>2010-11-23 07:39:58 +0100
commitd090f5976dfcac4935286676825d64e081335e09 (patch)
treec20140ce0f3f1b41a3ce403a1fc4b00ba504007f /sound
parent01e0f1378c47947b825eac05c98697ab1be1c86f (diff)
downloadmrst-s0i3-test-d090f5976dfcac4935286676825d64e081335e09.tar.gz
mrst-s0i3-test-d090f5976dfcac4935286676825d64e081335e09.tar.xz
mrst-s0i3-test-d090f5976dfcac4935286676825d64e081335e09.zip
ALSA: Revert "ALSA: hda - Fix switching between dmic and mic using the same mux on IDT/STAC"
This reverts commit f41cc2a85d52ac6971299922084ac5ac59dc339d. The patch broke the digital mic pin handling wrongly. Reference: bko#23162 https://bugzilla.kernel.org/show_bug.cgi?id=23162 Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/patch_sigmatel.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index cfd73afad88..5c710807dfe 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -3491,10 +3491,8 @@ static int stac92xx_auto_create_dmic_input_ctls(struct hda_codec *codec,
return err;
}
- if (snd_hda_get_bool_hint(codec, "separate_dmux") != 1) {
+ if (snd_hda_get_bool_hint(codec, "separate_dmux") != 1)
snd_hda_add_imux_item(imux, label, index, NULL);
- spec->num_analog_muxes++;
- }
}
return 0;