diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-03-05 12:00:29 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-03-05 12:00:29 +0100 |
| commit | f3e9b59cb948e2328bc06635ad39572d5b7b4791 (patch) | |
| tree | 2645d21c1006045aa4c6269674889de298e6cecb /sound | |
| parent | ALSA: hda - Add missing loopback merge path for AD1884/1984 codecs (diff) | |
| download | linux-f3e9b59cb948e2328bc06635ad39572d5b7b4791.tar.xz linux-f3e9b59cb948e2328bc06635ad39572d5b7b4791.zip | |
ALSA: hda - Use analog beep for Thinkpads with AD1984 codecs
For making the driver behavior compatible with the earlier kernels,
use the analog beep in the loopback path instead of the digital beep.
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/hda/patch_analog.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c index 498971095869..8ed0bcc01386 100644 --- a/sound/pci/hda/patch_analog.c +++ b/sound/pci/hda/patch_analog.c @@ -1026,6 +1026,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 */ } } |