| From | Herton Ronaldo Krzesinski <> | Subject | [PATCH 019/241] floppy: do put_disk on current dr if blk_init_queue fails | Date | Thu, 13 Dec 2012 11:56:24 -0200 |
| |
3.5.7.2 -stable review patch. If anyone has any objections, please let me know.
------------------
From: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
commit 238ab78469c6ab7845b43d5061cd3c92331b2452 upstream.
If blk_init_queue fails, we do not call put_disk on the current dr (dr is decremented first in the error handling loop).
Reviewed-by: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Jens Axboe <axboe@kernel.dk> Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com> --- drivers/block/floppy.c | 1 + 1 file changed, 1 insertion(+)
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index 3817084..889f47e 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c @@ -4151,6 +4151,7 @@ static int __init 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; } -- 1.7.9.5
|