From f046a537f600ec6a9aec1804f639ffbe3b05f339 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 4 Nov 2009 12:46:49 +0100
Subject: [PATCH] --- yaml --- r: 170329 b: refs/heads/master c:
 5f81669750504b1e7e00acde5068d972af466f29 h: refs/heads/master i:   170327:
 b54719a38d72db8935c25e18e4b5ac9a27be5156 v: v3

---
 [refs]                         | 2 +-
 trunk/sound/pci/hda/hda_beep.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 174b437551e6..216d65cba02c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 13dab0808bb41b18888e1758a060a685deee1f30
+refs/heads/master: 5f81669750504b1e7e00acde5068d972af466f29
diff --git a/trunk/sound/pci/hda/hda_beep.c b/trunk/sound/pci/hda/hda_beep.c
index 74db40edb336..c819152de79b 100644
--- a/trunk/sound/pci/hda/hda_beep.c
+++ b/trunk/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;