This patch handles blk_register_region() return value. Earlier blk_register_region() function doesn't handle error cases, now it is added, so the callers of this function should also handle it. Signed-off-by: Vishnu Pratap Singh <vishnu.ps@xxxxxxxxxxx> --- - Verfied on X86 based ubuntu machine. - This patch depends on [PATCH 1/8] block/genhd.c: Add error handling - Changes v1 -> v2: - updated as per the Grant's review comment drivers/block/floppy.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index 331363e..459807c 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c @@ -4219,8 +4219,10 @@ static int __init do_floppy_init(void) if (err) goto out_unreg_blkdev; - blk_register_region(MKDEV(FLOPPY_MAJOR, 0), 256, THIS_MODULE, + err = blk_register_region(MKDEV(FLOPPY_MAJOR, 0), 256, THIS_MODULE, floppy_find, NULL, NULL); + if (err) + goto out_driver_unregister; for (i = 0; i < 256; i++) if (ITYPE(i)) @@ -4359,6 +4361,7 @@ out_release_dma: floppy_release_irq_and_dma(); out_unreg_region: blk_unregister_region(MKDEV(FLOPPY_MAJOR, 0), 256); +out_driver_unregister: platform_driver_unregister(&floppy_driver); out_unreg_blkdev: unregister_blkdev(FLOPPY_MAJOR, "fd"); -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
