diff options
| author | Jaroslav Kysela <perex@perex.cz> | 2009-11-04 12:46:49 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-11-16 11:35:05 +0100 |
| commit | 5f81669750504b1e7e00acde5068d972af466f29 (patch) | |
| tree | b9e4a0c075899ef880c904c27fe1fe756c74d9ff /sound/pci/hda | |
| parent | ALSA: hda_intel: Digital PC Beep - delay input device unregistration (diff) | |
| download | linux-5f81669750504b1e7e00acde5068d972af466f29.tar.xz linux-5f81669750504b1e7e00acde5068d972af466f29.zip | |
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')
| -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) 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; |