diff --git a/[refs] b/[refs]
index 6605ad5936df..5a67dfe8749e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 151f52f09c5728ecfdd0c289da1a4b30bb416f2c
+refs/heads/master: d017bf6b4ff57db16a481a48bdad79274610a403
diff --git a/trunk/drivers/block/floppy.c b/trunk/drivers/block/floppy.c
index 8f19b380ca83..3951020e494a 100644
--- a/trunk/drivers/block/floppy.c
+++ b/trunk/drivers/block/floppy.c
@@ -4573,8 +4573,8 @@ static void __exit floppy_module_exit(void)
 			device_remove_file(&floppy_device[drive].dev, &dev_attr_cmos);
 			platform_device_unregister(&floppy_device[drive]);
 		}
-		put_disk(disks[drive]);
 		blk_cleanup_queue(disks[drive]->queue);
+		put_disk(disks[drive]);
 	}
 
 	del_timer_sync(&fd_timeout);