| From | Greg Kroah-Hartman <> | Subject | [PATCH 3.13 052/149] ALSA: hda - Use analog beep for Thinkpads with AD1984 codecs | Date | Thu, 20 Mar 2014 17:03:35 -0700 |
| |
3.13-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <tiwai@suse.de>
commit f3e9b59cb948e2328bc06635ad39572d5b7b4791 upstream.
For making the driver behavior compatible with the earlier kernels, use the analog beep in the loopback path instead of the digital beep.
Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--- sound/pci/hda/patch_analog.c | 3 +++ 1 file changed, 3 insertions(+)
--- a/sound/pci/hda/patch_analog.c +++ b/sound/pci/hda/patch_analog.c @@ -1025,6 +1025,9 @@ static void ad1884_fixup_thinkpad(struct spec->gen.keep_eapd_on = 1; spec->gen.vmaster_mute.hook = ad_vmaster_eapd_hook; spec->eapd_nid = 0x12; + /* Analog PC Beeper - allow firmware/ACPI beeps */ + spec->beep_amp = HDA_COMPOSE_AMP_VAL(0x20, 3, 3, HDA_INPUT); + spec->gen.beep_nid = 0; /* no digital beep */ } }
|