[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20210901210028.1750956-3-mcgrof@kernel.org>
Date: Wed, 1 Sep 2021 14:00:20 -0700
From: Luis Chamberlain <mcgrof@...nel.org>
To: axboe@...nel.dk, bhelgaas@...gle.com, liushixin2@...wei.com,
thunder.leizhen@...wei.com, lee.jones@...aro.org,
geoff@...radead.org, mpe@...erman.id.au, benh@...nel.crashing.org,
paulus@...ba.org, jim@...n.com, haris.iqbal@...os.com,
jinpu.wang@...os.com, josh.h.morris@...ibm.com,
pjk1939@...ux.ibm.com, tim@...erelk.net, richard@....at,
miquel.raynal@...tlin.com, vigneshr@...com
Cc: linux-mtd@...ts.infradead.org, linuxppc-dev@...ts.ozlabs.org,
linux-block@...r.kernel.org, linux-kernel@...r.kernel.org,
Luis Chamberlain <mcgrof@...nel.org>
Subject: [PATCH 02/10] pktcdvd: 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.
The out_mem2 error label already does what we need so
re-use that.
Signed-off-by: Luis Chamberlain <mcgrof@...nel.org>
---
drivers/block/pktcdvd.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index 0f26b2510a75..415248962e67 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -2729,7 +2729,9 @@ static int pkt_setup_dev(dev_t dev, dev_t* pkt_dev)
/* inherit events of the host device */
disk->events = pd->bdev->bd_disk->events;
- add_disk(disk);
+ ret = add_disk(disk);
+ if (ret)
+ goto out_mem2;
pkt_sysfs_dev_new(pd);
pkt_debugfs_dev_new(pd);
--
2.30.2
Powered by blists - more mailing lists