diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-05-24 08:27:52 +0200 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-06-10 13:42:09 -0400 |
| commit | 3c28d65e3835df1421d94cc57c77b26c9a1c3e44 (patch) | |
| tree | 3758183eb6b86e785026f170aba4a0f6f15e4ece | |
| parent | 139cec161789dd64d0c4a1ff4dfd5eee852223af (diff) | |
Revert "ALSA: hda - Add mute-LED mode control to Thinkpad"
[ Upstream commit 3530febb5c7636f6b26d15637f68296804d26491 ]
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>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
| -rw-r--r-- | sound/pci/hda/thinkpad_helper.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/pci/hda/thinkpad_helper.c b/sound/pci/hda/thinkpad_helper.c index 2341fc334163..6ba0b5517c40 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) { |