diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-11-12 18:45:04 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-11-13 16:37:14 +0300 |
| commit | 4d4e9bb339cfcde7811af10859ba1ce2fe3d46b4 (patch) | |
| tree | bf9bbfdc9e6c0a9d912013edfba83924d50b6eda /sound/pci/hda/hda_beep.c | |
| parent | d7a8943635485597ae7c6d554a8ccf3ce5a42d2d (diff) | |
| download | linux-4d4e9bb339cfcde7811af10859ba1ce2fe3d46b4.tar.xz | |
ALSA: hda - Add digital beep playback switch for STAC/IDT codecs
The digital beep widget may have no mute control, and always enabling
the beep is ofen pretty annoying, especially on laptops.
This patch adds a mixer control "PC Beep Playback Switch" when there
is no mixer amp mute is found, and controls it on software.
Reference: Novell bnc#444572
https://bugzilla.novell.com/show_bug.cgi?id=444572
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_beep.c')
| -rw-r--r-- | sound/pci/hda/hda_beep.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_beep.c b/sound/pci/hda/hda_beep.c index 9b77b3e0fa98..b1796ae1e8fb 100644 --- a/sound/pci/hda/hda_beep.c +++ b/sound/pci/hda/hda_beep.c @@ -37,6 +37,9 @@ static void snd_hda_generate_beep(struct work_struct *work) container_of(work, struct hda_beep, beep_work); struct hda_codec *codec = beep->codec; + if (!beep->enabled) + return; + /* generate tone */ snd_hda_codec_write_cache(codec, beep->nid, 0, AC_VERB_SET_BEEP_CONTROL, beep->tone); @@ -115,6 +118,7 @@ int snd_hda_attach_beep_device(struct hda_codec *codec, int nid) beep->nid = nid; beep->dev = input_dev; beep->codec = codec; + beep->enabled = 1; codec->beep = beep; INIT_WORK(&beep->beep_work, &snd_hda_generate_beep); |