---

yaml --- r: 170329 b: refs/heads/master c: 5f81669 h: refs/heads/master i: 170327: b54719a v: v3
git-mirror · Nov 16, 2009 · f046a53 · f046a53
1 parent b4bde37
commit f046a53
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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;