From: Luis Chamberlain <mcgrof@kernel.org>
Date: Mon, 27 Sep 2021 15:02:53 -0700
Subject: [PATCH] floppy: add error handling support for add_disk()
Git-commit: 47d34aa2d211e9cef61dd85b7b0011c9f61dd0ae
Patch-mainline: v5.16-rc1
References: jsc#PED-1183
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>
Acked-by: Hannes Reinecke <hare@suse.com>
---
drivers/block/floppy.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index acde3cb63ef4..3873e789478e 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;
--
2.35.3