diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-03-23 13:44:40 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-03-23 13:44:40 +0100 |
| commit | 23c8bd0b36900e91ad244a9c400975a256f70313 (patch) | |
| tree | 9ad8b18e8fe4e677e12d14b887193af8872124d3 | |
| parent | d34683d2094e8ea24c779d74627bd38d422a5df7 (diff) | |
| download | alsa-driver-build-unstable-23c8bd0b36900e91ad244a9c400975a256f70313.tar.gz | |
Refresh pci/hda/hda_beep.patch for resolving fuzz
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | alsa/pci/hda/hda_beep.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/alsa/pci/hda/hda_beep.patch b/alsa/pci/hda/hda_beep.patch index 06341a34c..6dd0cef62 100644 --- a/alsa/pci/hda/hda_beep.patch +++ b/alsa/pci/hda/hda_beep.patch @@ -1,12 +1,12 @@ ---- ../../alsa-kernel/pci/hda/hda_beep.c 2015-03-16 14:56:38.666616076 +0100 -+++ hda_beep.c 2015-03-16 15:06:17.428601095 +0100 +--- ../../alsa-kernel/pci/hda/hda_beep.c 2015-03-23 13:20:24.772960667 +0100 ++++ hda_beep.c 2015-03-23 13:42:24.569872096 +0100 @@ -1,3 +1,5 @@ +#define __NO_VERSION__ +#include "adriver.h" /* * Digital Beep Input Interface for HD-audio codec * -@@ -103,7 +105,11 @@ +@@ -109,7 +111,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: -@@ -127,7 +133,9 @@ +@@ -133,7 +139,9 @@ static void turn_off_beep(struct hda_beep *beep) { @@ -27,8 +27,8 @@ +#endif if (beep->playing) { /* turn off beep */ - snd_hda_codec_write(beep->codec, beep->nid, 0, -@@ -143,6 +151,9 @@ + generate_tone(beep, 0); +@@ -146,6 +154,9 @@ input_unregister_device(beep->dev); else input_free_device(beep->dev); @@ -38,7 +38,7 @@ beep->dev = NULL; turn_off_beep(beep); } -@@ -152,7 +163,11 @@ +@@ -155,7 +166,11 @@ struct input_dev *input_dev; struct hda_codec *codec = beep->codec; @@ -50,7 +50,7 @@ if (!input_dev) return -ENOMEM; -@@ -169,7 +184,11 @@ +@@ -172,7 +187,11 @@ 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; @@ -62,7 +62,7 @@ beep->dev = input_dev; return 0; -@@ -275,6 +294,7 @@ +@@ -278,6 +297,7 @@ if (!beep || !beep->dev) return 0; @@ -70,7 +70,7 @@ err = input_register_device(beep->dev); if (err < 0) { codec_err(codec, "hda_beep: unable to register input device\n"); -@@ -283,6 +303,9 @@ +@@ -286,6 +306,9 @@ kfree(beep); return err; } |