Commit b3f1735b authored Oct 11, 2016 by Hui Wang Committed by Greg Kroah-Hartman Oct 28, 2016

ALSA: hda - Fix a failure of micmute led when having multi adcs



commit 4875a5f7218068cdeea5f998330dfa3d118b2fea upstream.

On a Dell laptop, there is no global adcs for all input devices, so
the input devices use the different adc, as a result, dyn_adc_switch
is set to true.

In this situation, it is safe to control the micmute led according to
user's choice of muting/unmuting the current input device, since only
current input device path is active, while other input device paths
are inactive and powered down.

Fixes: 00ef9940 ('ALSA: hda - add mic mute led hook for dell machines')
Signed-off-by: Hui Wang <hui.wang@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 9058e7d7

sound/pci/hda/dell_wmi_helper.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -49,7 +49,7 @@ static void alc_fixup_dell_wmi(struct hda_codec *codec,
		removefunc = true;
		if (dell_led_set_func(DELL_LED_MICMUTE, false) >= 0) {
		dell_led_value = 0;
		if (spec->gen.num_adc_nids > 1)
		if (spec->gen.num_adc_nids > 1 && !spec->gen.dyn_adc_switch)
		codec_dbg(codec, "Skipping micmute LED control due to several ADCs");
		else {
		dell_old_cap_hook = spec->gen.cap_sync_hook;

sound/pci/hda/thinkpad_helper.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -75,7 +75,7 @@ static void hda_fixup_thinkpad_acpi(struct hda_codec *codec,
		removefunc = false;
		}
		if (led_set_func(TPACPI_LED_MICMUTE, false) >= 0) {
		if (spec->num_adc_nids > 1)
		if (spec->num_adc_nids > 1 && !spec->dyn_adc_switch)
		codec_dbg(codec,
		"Skipping micmute LED control due to several ADCs");
		else {