diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-10-27 08:52:53 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-10-27 08:52:53 +0200 |
| commit | 87bd082af1a6468b8bd9db93b37e27ec220fd1e5 (patch) | |
| tree | 776b6178c1b1753058f80307add711b77676befc | |
| parent | d4453cec69a95e3b74d108c45abb2841ce4d8921 (diff) | |
| download | alsa-driver-build-unstable-87bd082af1a6468b8bd9db93b37e27ec220fd1e5.tar.gz | |
Regenerated hda_beep.patch
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | pci/hda/hda_beep.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/pci/hda/hda_beep.patch b/pci/hda/hda_beep.patch index ac5b120c9..7cbffb955 100644 --- a/pci/hda/hda_beep.patch +++ b/pci/hda/hda_beep.patch @@ -1,12 +1,12 @@ ---- ../../alsa-kernel/pci/hda/hda_beep.c 2009-11-04 14:33:48.000000000 +0100 -+++ hda_beep.c 2009-11-10 13:25:36.000000000 +0100 +--- ../../alsa-kernel/pci/hda/hda_beep.c 2010-04-13 12:01:49.108966129 +0200 ++++ hda_beep.c 2010-10-27 08:52:10.845869828 +0200 @@ -1,3 +1,5 @@ +#define __NO_VERSION__ +#include "adriver.h" /* * Digital Beep Input Interface for HD-audio codec * -@@ -92,7 +94,11 @@ static int beep_standard_tone(struct hda +@@ -93,7 +95,11 @@ static int snd_hda_beep_event(struct input_dev *dev, unsigned int type, unsigned int code, int hz) { @@ -18,7 +18,7 @@ switch (code) { case SND_BELL: -@@ -116,8 +122,13 @@ static int snd_hda_beep_event(struct inp +@@ -117,8 +123,13 @@ static void snd_hda_do_detach(struct hda_beep *beep) { input_unregister_device(beep->dev); @@ -30,9 +30,9 @@ cancel_work_sync(&beep->beep_work); +#endif /* turn off beep for sure */ - snd_hda_codec_write_cache(beep->codec, beep->nid, 0, + snd_hda_codec_write(beep->codec, beep->nid, 0, AC_VERB_SET_BEEP_CONTROL, 0); -@@ -129,7 +140,11 @@ static int snd_hda_do_attach(struct hda_ +@@ -130,7 +141,11 @@ struct hda_codec *codec = beep->codec; int err; @@ -44,7 +44,7 @@ if (!input_dev) { printk(KERN_INFO "hda_beep: unable to allocate input device\n"); return -ENOMEM; -@@ -147,15 +162,26 @@ static int snd_hda_do_attach(struct hda_ +@@ -148,15 +163,26 @@ input_dev->evbit[0] = BIT_MASK(EV_SND); input_dev->sndbit[0] = BIT_MASK(SND_BELL) | BIT_MASK(SND_TONE); input_dev->event = snd_hda_beep_event; @@ -71,7 +71,7 @@ beep->dev = input_dev; return 0; } -@@ -238,7 +264,9 @@ void snd_hda_detach_beep_device(struct h +@@ -256,7 +282,9 @@ { struct hda_beep *beep = codec->beep; if (beep) { @@ -79,5 +79,5 @@ cancel_work_sync(&beep->register_work); +#endif cancel_delayed_work(&beep->unregister_work); - if (beep->enabled) + if (beep->dev) snd_hda_do_detach(beep); |