[PATCH 11/13] ps3vram: add error handling support for add_disk()
flat view
STALE1819d
LANDED
From: Luis Chamberlain <mcgrof@kernel.org>
Date: 2021-10-15 23:53:17
Also in:
linux-block, linux-nvme, lkml, nvdimm
Subsystem:
block layer, ps3 platform support, ps3vram driver, the rest · Maintainers:
Jens Axboe, Geoff Levand, Jim Paris, Linus Torvalds
Status: Landed in mainline as 3c30883acab1 on 2021-10-30.
Revision v1 (3 revisions archived).
Revisions (3)
- v1 current
- v2 [diff against previous]
- v3 [diff against previous]
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> --- drivers/block/ps3vram.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/block/ps3vram.c b/drivers/block/ps3vram.c
index c7b19e128b03..af2a0d09c598 100644
--- a/drivers/block/ps3vram.c
+++ b/drivers/block/ps3vram.c@@ -755,9 +755,14 @@ static int ps3vram_probe(struct ps3_system_bus_device *dev) dev_info(&dev->core, "%s: Using %llu MiB of GPU memory\n", gendisk->disk_name, get_capacity(gendisk) >> 11); - device_add_disk(&dev->core, gendisk, NULL); + error = device_add_disk(&dev->core, gendisk, NULL); + if (error) + goto out_cleanup_disk; + return 0; +out_cleanup_disk: + blk_cleanup_disk(gendisk); out_cache_cleanup: remove_proc_entry(DEVICE_NAME, NULL); ps3vram_cache_cleanup(dev);
--
2.30.2