projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
13dab08
)
ALSA: hda: beep - add missing cancel_delayed_work
author
Jaroslav Kysela
<perex@perex.cz>
Wed, 4 Nov 2009 11:46:49 +0000
(12:46 +0100)
committer
Takashi Iwai
<tiwai@suse.de>
Mon, 16 Nov 2009 10:35:05 +0000
(11:35 +0100)
The unregister work should be also canceled in snd_hda_detach_beep_device()
function.
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/hda/hda_beep.c
patch
|
blob
|
history
diff --git
a/sound/pci/hda/hda_beep.c
b/sound/pci/hda/hda_beep.c
index
74db40e
..
c819152
100644
(file)
--- a/
sound/pci/hda/hda_beep.c
+++ b/
sound/pci/hda/hda_beep.c
@@
-239,6
+239,7
@@
void snd_hda_detach_beep_device(struct hda_codec *codec)
struct hda_beep *beep = codec->beep;
if (beep) {
cancel_work_sync(&beep->register_work);
+ cancel_delayed_work(&beep->unregister_work);
if (beep->enabled)
snd_hda_do_detach(beep);
codec->beep = NULL;