1 files changed, 16 insertions, 1 deletions

diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 510fb10ec45a..9baf11e86362 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;
@@ -4579,6 +4585,15 @@ static void __exit floppy_module_exit(void)
                         platform_device_unregister(&floppy_device[drive]);
                 }
                 blk_cleanup_queue(disks[drive]->queue);
+
+                /*
+                 * These disks have not called add_disk().  Don't put down
+                 * queue reference in put_disk().
+                 */
+                if (!(allowed_drive_mask & (1 << drive)) ||
+                    fdc_state[FDC(drive)].version == FDC_NONE)
+                        disks[drive]->queue = NULL;
+
                 put_disk(disks[drive]);
         }