From: Hui Wang <hui.w...@canonical.com>

commit 404690649e6a52ee39817168f2d984726412e091 upstream.

Before the micmute_led_set() is introduced, the function of
alc_gpio_micmute_update() will set the gpio value with the
!micmute_led.led_value, and the machines have the correct micmute led
status. After the micmute_led_set() is introduced, it sets the gpio
value with !!micmute_led.led_value, so the led status is not correct
anymore, we need to set micmute_led_polarity = 1 to workaround it.

Now we fix the micmute_led_set() and remove micmute_led_polarity = 1.

Fixes: 87dc36482cab ("ALSA: hda/realtek - Add LED class support for micmute 
LED")
Reported-and-suggested-by: Kai-Heng Feng <kai.heng.f...@canonical.com>
Cc: <sta...@vger.kernel.org>
Signed-off-by: Hui Wang <hui.w...@canonical.com>
Link: https://lore.kernel.org/r/20200811122430.6546-1-hui.w...@canonical.com
Signed-off-by: Takashi Iwai <ti...@suse.de>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>

---
 sound/pci/hda/patch_realtek.c |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -4118,7 +4118,7 @@ static int micmute_led_set(struct led_cl
        struct alc_spec *spec = codec->spec;
 
        alc_update_gpio_led(codec, spec->gpio_mic_led_mask,
-                           spec->micmute_led_polarity, !!brightness);
+                           spec->micmute_led_polarity, !brightness);
        return 0;
 }
 
@@ -4173,8 +4173,6 @@ static void alc285_fixup_hp_gpio_led(str
 {
        struct alc_spec *spec = codec->spec;
 
-       spec->micmute_led_polarity = 1;
-
        alc_fixup_hp_gpio_led(codec, action, 0x04, 0x01);
 }
 
@@ -4426,7 +4424,6 @@ static void alc233_fixup_lenovo_line2_mi
 {
        struct alc_spec *spec = codec->spec;
 
-       spec->micmute_led_polarity = 1;
        alc_fixup_hp_gpio_led(codec, action, 0, 0x04);
        if (action == HDA_FIXUP_ACT_PRE_PROBE) {
                spec->init_amp = ALC_INIT_DEFAULT;


Reply via email to