From: Luis Chamberlain <mcgrof@kernel.org>
Date: Mon, 27 Sep 2021 22:02:53 +0000 (-0700)
Subject: floppy: add error handling support for add_disk()
X-Git-Tag: v6.1-rc5~2682^2~99
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=47d34aa2d211e9cef61dd85b7b0011c9f61dd0ae;p=platform%2Fkernel%2Flinux-starfive.git

floppy: add error handling support for add_disk()

We never checked for errors on add_disk() as this function
returned void. Now that this is fixed, use the shiny new
error handling.

Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
Link: https://lore.kernel.org/r/20210927220302.1073499-6-mcgrof@kernel.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index acde3cb..3873e78 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -4697,8 +4697,10 @@ static int __init do_floppy_init(void)
 
 		registered[drive] = true;
 
-		device_add_disk(&floppy_device[drive].dev, disks[drive][0],
-				NULL);
+		err = device_add_disk(&floppy_device[drive].dev,
+				      disks[drive][0], NULL);
+		if (err)
+			goto out_remove_drives;
 	}
 
 	return 0;