diff options
authorTakashi Iwai <>2015-05-24 08:27:52 +0200
committerGreg Kroah-Hartman <>2015-06-06 08:19:33 -0700
commit33dc294ef27f02fdd33eeda14d6ce1b2dbeddf69 (patch)
parent84c28caf882dac288877716ceafd8dce2d96fd46 (diff)
Revert "ALSA: hda - Add mute-LED mode control to Thinkpad"
commit 3530febb5c7636f6b26d15637f68296804d26491 upstream. 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 <> Cc: Pali Rohár <> Signed-off-by: Takashi Iwai <> Signed-off-by: Greg Kroah-Hartman <>
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/pci/hda/thinkpad_helper.c b/sound/pci/hda/thinkpad_helper.c
index 1eafc1a28193..8fe3b8c18ed4 100644
--- a/sound/pci/hda/thinkpad_helper.c
+++ b/sound/pci/hda/thinkpad_helper.c
@@ -71,7 +71,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) {