diff --git a/[refs] b/[refs] index a6aa98d265b7..a8697164d656 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 433039e97f672b81e6c8f6daef385dcf035c6e29 +refs/heads/master: c093ee4f07f46d3a835841cafa07514fa94878d2 diff --git a/trunk/drivers/block/floppy.c b/trunk/drivers/block/floppy.c index 767107cce982..8f19b380ca83 100644 --- a/trunk/drivers/block/floppy.c +++ b/trunk/drivers/block/floppy.c @@ -4363,9 +4363,9 @@ static int __init floppy_init(void) out_put_disk: while (dr--) { del_timer(&motor_off_timer[dr]); - put_disk(disks[dr]); if (disks[dr]->queue) blk_cleanup_queue(disks[dr]->queue); + put_disk(disks[dr]); } return err; }