floppy: do put_disk on current dr if blk_init_queue fails
authorHerton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
Mon, 27 Aug 2012 23:56:52 +0000 (20:56 -0300)
committerJens Axboe <axboe@kernel.dk>
Tue, 30 Oct 2012 07:34:25 +0000 (08:34 +0100)
If blk_init_queue fails, we do not call put_disk on the current dr
(dr is decremented first in the error handling loop).

Cc: stable@vger.kernel.org
Reviewed-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/block/floppy.c

index 83112f08a41df91e5fd57451c19d0ad3856e858a..9a558b63e78fe0f2fcccf886397fdbaea86e7272 100644 (file)
@@ -4150,6 +4150,7 @@ static int __init do_floppy_init(void)
 
                disks[dr]->queue = blk_init_queue(do_fd_request, &floppy_lock);
                if (!disks[dr]->queue) {
+                       put_disk(disks[dr]);
                        err = -ENOMEM;
                        goto out_put_disk;
                }