| Message ID | 20210312041408.3776-1-hui.wang@canonical.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 2bf44e0ee95f39cc54ea1b942f0a027e0181ca4e |
| Headers | show |
| Series | ALSA: hda: generic: Fix the micmute led init state | expand |
On Fri, 12 Mar 2021 05:14:08 +0100, Hui Wang wrote: > > Recently we found the micmute led init state is not correct after > freshly installing the ubuntu linux on a Lenovo AIO machine. The > internal mic is not muted, but the micmute led is on and led mode is > 'follow mute'. If we mute internal mic, the led is keeping on, then > unmute the internal mic, the led is off. And from then on, the > micmute led will work correctly. > > So the micmute led init state is not correct. The led is controlled > by codec gpio (ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY), in the > patch_realtek, the gpio data is set to 0x4 initially and the led is > on with this data. In the hda_generic, the led_value is set to > 0 initially, suppose users set the 'capture switch' to on from > user space and the micmute led should change to be off with this > operation, but the check "if (val == spec->micmute_led.led_value)" in > the call_micmute_led_update() will skip the led setting. > > To guarantee the led state will be set by the 1st time of changing > "Capture Switch", set -1 to the init led_value. > > Cc: <stable@vger.kernel.org> > Signed-off-by: Hui Wang <hui.wang@canonical.com> Applied, thanks. Takashi
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c index 8b7c5508f368..f5cba7afd1c6 100644 --- a/sound/pci/hda/hda_generic.c +++ b/sound/pci/hda/hda_generic.c @@ -4065,7 +4065,7 @@ static int add_micmute_led_hook(struct hda_codec *codec) spec->micmute_led.led_mode = MICMUTE_LED_FOLLOW_MUTE; spec->micmute_led.capture = 0; - spec->micmute_led.led_value = 0; + spec->micmute_led.led_value = -1; spec->micmute_led.old_hook = spec->cap_sync_hook; spec->cap_sync_hook = update_micmute_led; if (!snd_hda_gen_add_kctl(spec, NULL, &micmute_led_mode_ctl))
Recently we found the micmute led init state is not correct after freshly installing the ubuntu linux on a Lenovo AIO machine. The internal mic is not muted, but the micmute led is on and led mode is 'follow mute'. If we mute internal mic, the led is keeping on, then unmute the internal mic, the led is off. And from then on, the micmute led will work correctly. So the micmute led init state is not correct. The led is controlled by codec gpio (ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY), in the patch_realtek, the gpio data is set to 0x4 initially and the led is on with this data. In the hda_generic, the led_value is set to 0 initially, suppose users set the 'capture switch' to on from user space and the micmute led should change to be off with this operation, but the check "if (val == spec->micmute_led.led_value)" in the call_micmute_led_update() will skip the led setting. To guarantee the led state will be set by the 1st time of changing "Capture Switch", set -1 to the init led_value. Cc: <stable@vger.kernel.org> Signed-off-by: Hui Wang <hui.wang@canonical.com> --- sound/pci/hda/hda_generic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)