Commit 238ab784 authored Aug 27, 2012 by Herton Ronaldo Krzesinski Committed by Jens Axboe Oct 30, 2012

floppy: do put_disk on current dr if blk_init_queue fails



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>

parent b54e1f88

drivers/block/floppy.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -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;
		}