From: Takashi Iwai Date: Wed, 5 Mar 2014 11:00:29 +0000 (+0100) Subject: ALSA: hda - Use analog beep for Thinkpads with AD1984 codecs X-Git-Tag: v3.13.7~98 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dfb75ea6ce2a965038e743e8b08cc44fec24e50d;p=thirdparty%2Fkernel%2Fstable.git ALSA: hda - Use analog beep for Thinkpads with AD1984 codecs 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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c index 20c32d373a328..6f8750c59a12d 100644 --- a/sound/pci/hda/patch_analog.c +++ b/sound/pci/hda/patch_analog.c @@ -1025,6 +1025,9 @@ static void ad1884_fixup_thinkpad(struct hda_codec *codec, 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 */ } }