[alsa-devel] [PATCH 1/2] ALSA: hda - fix a typo by changing mute_led_nid to cap_mute_led_nid
BugLink: https://bugs.launchpad.net/bugs/1329580 Cc: David Henningsson david.henningsson@canonical.com Cc: Kailang Yang kailang@realtek.com Signed-off-by: Hui Wang hui.wang@canonical.com --- sound/pci/hda/patch_realtek.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 327413e..73b1759 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -3529,7 +3529,7 @@ static void alc269_fixup_hp_cap_mic_mute_hook(struct hda_codec *codec, struct alc_spec *spec = codec->spec; unsigned int pinval, enable, disable;
- pinval = snd_hda_codec_get_pin_target(codec, spec->mute_led_nid); + pinval = snd_hda_codec_get_pin_target(codec, spec->cap_mute_led_nid); pinval &= ~AC_PINCTL_VREFEN; enable = pinval | AC_PINCTL_VREF_80; disable = pinval | AC_PINCTL_VREF_HIZ;
Now the led_power_filter() needs to handle 3 situations: - only mute_led_nid is set - only cap_mute_led_nid is set - both mute_led_ind and cap_mute_led_nid are set
BugLink: https://bugs.launchpad.net/bugs/1329580 Cc: David Henningsson david.henningsson@canonical.com Cc: Kailang Yang kailang@realtek.com Signed-off-by: Hui Wang hui.wang@canonical.com --- sound/pci/hda/patch_realtek.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 73b1759..512582b 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -3403,7 +3403,8 @@ static unsigned int led_power_filter(struct hda_codec *codec, { struct alc_spec *spec = codec->spec;
- if (power_state != AC_PWRST_D3 || nid != spec->mute_led_nid) + if (power_state != AC_PWRST_D3 || nid == 0 || + (nid != spec->mute_led_nid && nid != spec->cap_mute_led_nid)) return power_state;
/* Set pin ctl again, it might have just been set to 0 */ @@ -3563,6 +3564,7 @@ static void alc269_fixup_hp_gpio_mic1_led(struct hda_codec *codec, spec->gpio_led = 0; spec->cap_mute_led_nid = 0x18; snd_hda_add_verbs(codec, gpio_init); + codec->power_filter = led_power_filter; } }
At Tue, 8 Jul 2014 17:56:14 +0800, Hui Wang wrote:
BugLink: https://bugs.launchpad.net/bugs/1329580 Cc: David Henningsson david.henningsson@canonical.com Cc: Kailang Yang kailang@realtek.com Signed-off-by: Hui Wang hui.wang@canonical.com
Thanks, applied both patches now.
Takashi
sound/pci/hda/patch_realtek.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 327413e..73b1759 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -3529,7 +3529,7 @@ static void alc269_fixup_hp_cap_mic_mute_hook(struct hda_codec *codec, struct alc_spec *spec = codec->spec; unsigned int pinval, enable, disable;
- pinval = snd_hda_codec_get_pin_target(codec, spec->mute_led_nid);
- pinval = snd_hda_codec_get_pin_target(codec, spec->cap_mute_led_nid); pinval &= ~AC_PINCTL_VREFEN; enable = pinval | AC_PINCTL_VREF_80; disable = pinval | AC_PINCTL_VREF_HIZ;
-- 1.8.1.2
participants (2)
-
Hui Wang -
Takashi Iwai