diff options
| author | Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com> | 2012-08-28 01:56:52 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2012-10-30 08:34:25 +0100 |
| commit | 238ab78469c6ab7845b43d5061cd3c92331b2452 (patch) | |
| tree | c6ba70c3241fa3ca4932218c06cbf12162aa2eec /drivers/block | |
| parent | floppy: don't call alloc_ordered_workqueue inside the alloc_disk loop (diff) | |
| download | linux-238ab78469c6ab7845b43d5061cd3c92331b2452.tar.xz linux-238ab78469c6ab7845b43d5061cd3c92331b2452.zip | |
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>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/floppy.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index 83112f08a41d..9a558b63e78f 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c @@ -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; } |