From: Andrew Morton <akpm@osdl.org>

Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/block/floppy.c |    2 ++
 1 files changed, 2 insertions(+)

diff -puN drivers/block/floppy.c~drivers-block-floppyc-dont-free_irq-from-irq-context-fix drivers/block/floppy.c
--- 25/drivers/block/floppy.c~drivers-block-floppyc-dont-free_irq-from-irq-context-fix	Fri Jan 27 14:31:26 2006
+++ 25-akpm/drivers/block/floppy.c	Fri Jan 27 14:31:26 2006
@@ -4651,6 +4651,8 @@ void cleanup_module(void)
 	/* eject disk, if any */
 	fd_eject(0);
 
+	flush_scheduled_work();		/* fd_free_irq() might be pending */
+
 	wait_for_completion(&device_release);
 }
 
_