summaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/thinkpad_helper.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-05-24 08:27:52 +0200
committerTakashi Iwai <tiwai@suse.de>2015-05-24 08:32:37 +0200
commit3530febb5c7636f6b26d15637f68296804d26491 (patch)
treebc2435a4caa039078559a7ebc0153bcf22fe0eaf /sound/pci/hda/thinkpad_helper.c
parentALSA: usb-audio: Add quirk for MS LifeCam HD-3000 (diff)
downloadlinux-3530febb5c7636f6b26d15637f68296804d26491.tar.xz
linux-3530febb5c7636f6b26d15637f68296804d26491.zip
Revert "ALSA: hda - Add mute-LED mode control to Thinkpad"
This reverts commit 7290006d8c0900c56d8c58428134f02c35109d17. Through the regression report, it was revealed that the tpacpi_led_set() call to thinkpad_acpi helper doesn't only toggle the mute LED but actually mutes the sound. This is contradiction to the expectation, and rather confuses user. According to Henrique, it's not trivial to judge which TP model behaves "LED-only" and which model does whatever more intrusive, as Lenovo's implementations vary model by model. So, from the safety reason, we should revert the patch for now. Reported-by: Martin Steigerwald <martin@lichtvoll.de> Cc: Pali Rohár <pali.rohar@gmail.com> Cc: <stable@vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/thinkpad_helper.c')
-rw-r--r--sound/pci/hda/thinkpad_helper.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/pci/hda/thinkpad_helper.c b/sound/pci/hda/thinkpad_helper.c
index d51703e30523..0a4ad5feb82e 100644
--- a/sound/pci/hda/thinkpad_helper.c
+++ b/sound/pci/hda/thinkpad_helper.c
@@ -72,7 +72,6 @@ static void hda_fixup_thinkpad_acpi(struct hda_codec *codec,
if (led_set_func(TPACPI_LED_MUTE, false) >= 0) {
old_vmaster_hook = spec->vmaster_mute.hook;
spec->vmaster_mute.hook = update_tpacpi_mute_led;
- spec->vmaster_mute_enum = 1;
removefunc = false;
}
if (led_set_func(TPACPI_LED_MICMUTE, false) >= 0) {