ALSA: hda - fix a typo by changing mute_led_nid to cap_mute_led_nid
PATCH 1/2 ALSA: hda - fix a typo by changing mute_led_nid to cap_mute_led_nid
Cc David Henningsson <[email protected]>
Cc Kailang Yang <[email protected]>
Signed-off-by Hui Wang <[email protected]>
--- sound/pci/hda/patch_realtek.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/pci/hda/patch_realtek.c +1 -1
@@ -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 ;
Signature · 1 line
1.8.1.2
PATCH 2/2 ALSA: hda - add capture mute led support in led_power_filter
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
Cc David Henningsson <[email protected]>
Cc Kailang Yang <[email protected]>
Signed-off-by Hui Wang <[email protected]>
--- sound/pci/hda/patch_realtek.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
sound/pci/hda/patch_realtek.c +3 -1
@@ -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; } }
Signature · 1 line
1.8.1.2
Takashi Iwai
AppliedAt Tue, 8 Jul 2014 17:56:14 +0800,
Quoted 5 lines · Hui Wang
Cc David Henningsson <[email protected]>Cc Kailang Yang <[email protected]>Signed-off-by Hui Wang <[email protected]>
Thanks, applied both patches now.
Takashi
Quoted 20 lines
--- sound/pci/hda/patch_realtek.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)sound/pci/hda/patch_realtek.c +1
-1@@ -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 ;Signature · 1 line
1.8.1.2