diff options
author | Jaroslav Kysela <perex@perex.cz> | 2009-11-04 06:46:49 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-11-16 05:35:05 -0500 |
commit | 5f81669750504b1e7e00acde5068d972af466f29 (patch) | |
tree | b9e4a0c075899ef880c904c27fe1fe756c74d9ff /sound/pci/hda/hda_beep.c | |
parent | 13dab0808bb41b18888e1758a060a685deee1f30 (diff) |
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/pci/hda/hda_beep.c')
-rw-r--r-- | sound/pci/hda/hda_beep.c | 1 |
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) | |||
239 | struct hda_beep *beep = codec->beep; | 239 | struct hda_beep *beep = codec->beep; |
240 | if (beep) { | 240 | if (beep) { |
241 | cancel_work_sync(&beep->register_work); | 241 | cancel_work_sync(&beep->register_work); |
242 | cancel_delayed_work(&beep->unregister_work); | ||
242 | if (beep->enabled) | 243 | if (beep->enabled) |
243 | snd_hda_do_detach(beep); | 244 | snd_hda_do_detach(beep); |
244 | codec->beep = NULL; | 245 | codec->beep = NULL; |