| From 3530febb5c7636f6b26d15637f68296804d26491 Mon Sep 17 00:00:00 2001 |
| From: Takashi Iwai <tiwai@suse.de> |
| Date: Sun, 24 May 2015 08:27:52 +0200 |
| Subject: Revert "ALSA: hda - Add mute-LED mode control to Thinkpad" |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Takashi Iwai <tiwai@suse.de> |
| |
| 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 <martin@lichtvoll.de> |
| Cc: Pali Rohár <pali.rohar@gmail.com> |
| Signed-off-by: Takashi Iwai <tiwai@suse.de> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| sound/pci/hda/thinkpad_helper.c | 1 - |
| 1 file changed, 1 deletion(-) |
| |
| --- a/sound/pci/hda/thinkpad_helper.c |
| +++ b/sound/pci/hda/thinkpad_helper.c |
| @@ -71,7 +71,6 @@ static void hda_fixup_thinkpad_acpi(stru |
| 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) { |
