diff --git a/sound/pci/hda/hda_beep.c b/sound/pci/hda/hda_beep.c
index 74db40edb336e4163f4157d06c42e6e22fdee855..c819152de79b1a145e060ed92b99c6c58b8a4ef6 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;