From: Luis Chamberlain <mcgrof@kernel.org>
Date: Mon, 27 Sep 2021 15:01:07 -0700
Subject: [PATCH] pcd: add error handling support for add_disk()
Git-commit: 4dfbd1390af60765774d9565858d1a6fadacde32
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>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Acked-by: Hannes Reinecke <hare@suse.com>
---
drivers/block/paride/pcd.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/block/paride/pcd.c b/drivers/block/paride/pcd.c
index 93ed63626232..a7fab3830d7b 100644
--- a/drivers/block/paride/pcd.c
+++ b/drivers/block/paride/pcd.c
@@ -941,9 +941,13 @@ static int pcd_init_unit(struct pcd_unit *cd, bool autoprobe, int port,
cd->present = 1;
pcd_probe_capabilities(cd);
register_cdrom(cd->disk, &cd->info);
- add_disk(cd->disk);
+ ret = add_disk(cd->disk);
+ if (ret)
+ goto out_unreg_cdrom;
return 0;
+out_unreg_cdrom:
+ unregister_cdrom(&cd->info);
out_pi_release:
pi_release(cd->pi);
out_free_disk:
--
2.35.3