Commit f2005e17 authored by Jiri Slaby's avatar Jiri Slaby Committed by Linus Torvalds

block: floppy: fix rmmod lockup

Floppy rmmod locks up when no such hardware was initialized, since there is
nobody to wake the remove code up.  Remove the completion, because release is
called during platform_unregister anyway.
Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Cc: Jens Axboe <jens.axboe@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent bd0e88e5
...@@ -217,7 +217,6 @@ static int use_virtual_dma; ...@@ -217,7 +217,6 @@ static int use_virtual_dma;
*/ */
static DEFINE_SPINLOCK(floppy_lock); static DEFINE_SPINLOCK(floppy_lock);
static struct completion device_release;
static unsigned short virtual_dma_port = 0x3f0; static unsigned short virtual_dma_port = 0x3f0;
irqreturn_t floppy_interrupt(int irq, void *dev_id); irqreturn_t floppy_interrupt(int irq, void *dev_id);
...@@ -4144,7 +4143,6 @@ DEVICE_ATTR(cmos,S_IRUGO,floppy_cmos_show,NULL); ...@@ -4144,7 +4143,6 @@ DEVICE_ATTR(cmos,S_IRUGO,floppy_cmos_show,NULL);
static void floppy_device_release(struct device *dev) static void floppy_device_release(struct device *dev)
{ {
complete(&device_release);
} }
static struct platform_device floppy_device[N_DRIVE]; static struct platform_device floppy_device[N_DRIVE];
...@@ -4539,7 +4537,6 @@ void cleanup_module(void) ...@@ -4539,7 +4537,6 @@ void cleanup_module(void)
{ {
int drive; int drive;
init_completion(&device_release);
blk_unregister_region(MKDEV(FLOPPY_MAJOR, 0), 256); blk_unregister_region(MKDEV(FLOPPY_MAJOR, 0), 256);
unregister_blkdev(FLOPPY_MAJOR, "fd"); unregister_blkdev(FLOPPY_MAJOR, "fd");
...@@ -4564,8 +4561,6 @@ void cleanup_module(void) ...@@ -4564,8 +4561,6 @@ void cleanup_module(void)
/* eject disk, if any */ /* eject disk, if any */
fd_eject(0); fd_eject(0);
wait_for_completion(&device_release);
} }
module_param(floppy, charp, 0); module_param(floppy, charp, 0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment