]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ALSA: hda - reverse the setting value in the micmute_led_set
authorHui Wang <hui.wang@canonical.com>
Tue, 11 Aug 2020 12:24:30 +0000 (20:24 +0800)
committerTakashi Iwai <tiwai@suse.de>
Tue, 11 Aug 2020 12:47:24 +0000 (14:47 +0200)
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.feng@canonical.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Hui Wang <hui.wang@canonical.com>
Link: https://lore.kernel.org/r/20200811122430.6546-1-hui.wang@canonical.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/hda/patch_realtek.c

index 09d93dd88713b04f7ecba92fe71224f4c2f6602b..073029aeaf3cffa81be6f3e24e68c8bf4fcc6423 100644 (file)
@@ -4125,7 +4125,7 @@ static int micmute_led_set(struct led_classdev *led_cdev,
        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;
 }
 
@@ -4162,8 +4162,6 @@ static void alc285_fixup_hp_gpio_led(struct hda_codec *codec,
 {
        struct alc_spec *spec = codec->spec;
 
-       spec->micmute_led_polarity = 1;
-
        alc_fixup_hp_gpio_led(codec, action, 0x04, 0x01);
 }
 
@@ -4414,7 +4412,6 @@ static void alc233_fixup_lenovo_line2_mic_hotkey(struct hda_codec *codec,
 {
        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;