diff mbox

Revert "ALSA: hda - Add mute-LED mode control to Thinkpad"

Message ID 1432449275-29789-1-git-send-email-tiwai@suse.de (mailing list archive)
State Accepted
Commit 3530febb5c7636f6b26d15637f68296804d26491
Headers show

Commit Message

Takashi Iwai May 24, 2015, 6:34 a.m. UTC
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>
---
 sound/pci/hda/thinkpad_helper.c | 1 -
 1 file changed, 1 deletion(-)

Comments

Raymond Yau May 25, 2015, 6:44 a.m. UTC | #1
>
> 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

Are there any ThinkPad which known to support mute led through ACPI SSMS ?
Takashi Iwai May 25, 2015, 6:53 a.m. UTC | #2
At Mon, 25 May 2015 14:44:04 +0800,
Raymond Yau wrote:
> 
> >
> > 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
> 
> Are there any ThinkPad which known to support mute led through ACPI SSMS ?

The answer is "yes, but..."

There are known Thinkpads that do the audio mute together with LED.
And judging the difference isn't trivial.  It'd need a huge
black/white list, which we want to avoid.


Takashi
Pali Rohár June 24, 2015, 1:10 p.m. UTC | #3
On Sunday 24 May 2015 08:34:35 Takashi Iwai wrote:
> 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>
> ---
>  sound/pci/hda/thinkpad_helper.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> 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) {

Hello,

what about adding option to "do not touch led" like if thinkpad_helper.c
cannot resolve symbol from kernel? It would at least allow us to disable
led when mute is ON (when thinkpad_acpi.ko module is loaded).
diff mbox

Patch

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) {