summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorJaroslav Kysela <perex@perex.cz>2009-11-04 14:46:49 +0300
committerTakashi Iwai <tiwai@suse.de>2009-11-16 13:35:05 +0300
commit5f81669750504b1e7e00acde5068d972af466f29 (patch)
treeb9e4a0c075899ef880c904c27fe1fe756c74d9ff /sound
parent13dab0808bb41b18888e1758a060a685deee1f30 (diff)
downloadlinux-5f81669750504b1e7e00acde5068d972af466f29.tar.xz
ALSA: hda: beep - add missing cancel_delayed_work
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>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/hda_beep.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_beep.c b/sound/pci/hda/hda_beep.c
index 74db40edb336..c819152de79b 100644
--- 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;