Patchwork [3.5.y.z,extended,stable] Patch "floppy: do put_disk on current dr if blk_init_queue fails" has been added to staging queue

mail settings
Submitter Herton Ronaldo Krzesinski
Date Dec. 5, 2012, 10:30 p.m.
Message ID <>
Download mbox | patch
Permalink /patch/204000/
State New
Headers show


Herton Ronaldo Krzesinski - Dec. 5, 2012, 10:30 p.m.
This is a note to let you know that I have just added a patch titled

    floppy: do put_disk on current dr if blk_init_queue fails

to the linux-3.5.y-queue branch of the 3.5.y.z extended stable tree 
which can be found at:;a=shortlog;h=refs/heads/linux-3.5.y-queue

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.5.y.z tree, see



From ae4d41850a13473d76303d0bb229c8d784d05af9 Mon Sep 17 00:00:00 2001
From: Herton Ronaldo Krzesinski <>
Date: Mon, 27 Aug 2012 20:56:52 -0300
Subject: [PATCH] floppy: do put_disk on current dr if blk_init_queue fails
X-Extended-Stable: 3.5

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