[ 07/24] floppy: do put_disk on current dr if blk_init_queue fails

2012-11-02 Thread Greg Kroah-Hartman
3.6-stable review patch.  If anyone has any objections, please let me know.

--

From: Herton Ronaldo Krzesinski 

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 
Signed-off-by: Herton Ronaldo Krzesinski 
Signed-off-by: Jiri Kosina 
Signed-off-by: Jens Axboe 
Signed-off-by: Greg Kroah-Hartman 

---
 drivers/block/floppy.c |1 +
 1 file changed, 1 insertion(+)

--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -4151,6 +4151,7 @@ static int __init do_floppy_init(void)
 
disks[dr]->queue = blk_init_queue(do_fd_request, _lock);
if (!disks[dr]->queue) {
+   put_disk(disks[dr]);
err = -ENOMEM;
goto out_put_disk;
}


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[ 07/24] floppy: do put_disk on current dr if blk_init_queue fails

2012-11-02 Thread Greg Kroah-Hartman
3.6-stable review patch.  If anyone has any objections, please let me know.

--

From: Herton Ronaldo Krzesinski herton.krzesin...@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 b...@decadent.org.uk
Signed-off-by: Herton Ronaldo Krzesinski herton.krzesin...@canonical.com
Signed-off-by: Jiri Kosina jkos...@suse.cz
Signed-off-by: Jens Axboe ax...@kernel.dk
Signed-off-by: Greg Kroah-Hartman gre...@linuxfoundation.org

---
 drivers/block/floppy.c |1 +
 1 file changed, 1 insertion(+)

--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -4151,6 +4151,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;
}


--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/