Commit 40469064 authored by Hui Wang's avatar Hui Wang Committed by Takashi Iwai
Browse files

ALSA: hda - reverse the setting value in the micmute_led_set



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: 87dc3648 ("ALSA: hda/realtek - Add LED class support for micmute LED")
Reported-and-suggested-by: default avatarKai-Heng Feng <kai.heng.feng@canonical.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarHui Wang <hui.wang@canonical.com>
Link: https://lore.kernel.org/r/20200811122430.6546-1-hui.wang@canonical.com


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 85cb905d
Loading
Loading
Loading
Loading
+1 −4
Original line number Diff line number Diff line
@@ -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;