1 files changed, 7 insertions, 1 deletions

diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 510fb10ec45a..401ba7833212 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -4368,8 +4368,14 @@ out_unreg_blkdev:
 out_put_disk:
         while (dr--) {
                 del_timer_sync(&motor_off_timer[dr]);
-                if (disks[dr]->queue)
+                if (disks[dr]->queue) {
                         blk_cleanup_queue(disks[dr]->queue);
+                        /*
+                         * put_disk() is not paired with add_disk() and
+                         * will put queue reference one extra time. fix it.
+                         */
+                        disks[dr]->queue = NULL;
+                }
                 put_disk(disks[dr]);
         }
         return err;