[PATCH 2/9] ms_block: add error handling support for add_disk()
flat view
STALE1848d
LANDED
From: Luis Chamberlain <mcgrof@kernel.org>
Date: 2021-09-02 17:41:58
Also in:
ceph-devel, linux-mmc, linux-s390, lkml
Subsystem:
sony memorystick subsystem, the rest · Maintainers:
Maxim Levitsky, Alex Dubov, Ulf Hansson, Linus Torvalds
Revision v1 of 2 in this series; landed in mainline as 2304c55fd506 on 2021-10-12.
Revisions (2)
- v1 current
- v2 [diff vs current]
We never checked for errors on add_disk() as this function returned void. Now that this is fixed, use the shiny new error handling. Contrary to the typical removal which delays the put_disk() until later, since we are failing on a probe we immediately put the disk on failure from add_disk by using blk_cleanup_disk(). Signed-off-by: Luis Chamberlain <mcgrof@kernel.org> --- drivers/memstick/core/ms_block.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/memstick/core/ms_block.c b/drivers/memstick/core/ms_block.c
index 4a4573fa7b0f..86c626933c1a 100644
--- a/drivers/memstick/core/ms_block.c
+++ b/drivers/memstick/core/ms_block.c@@ -2156,10 +2156,14 @@ static int msb_init_disk(struct memstick_dev *card) set_disk_ro(msb->disk, 1); msb_start(card); - device_add_disk(&card->dev, msb->disk, NULL); + rc = device_add_disk(&card->dev, msb->disk, NULL); + if (rc) + goto out_cleanup_disk; dbg("Disk added"); return 0; +out_cleanup_disk: + blk_cleanup_disk(msb->disk); out_free_tag_set: blk_mq_free_tag_set(&msb->tag_set); out_release_id:
--
2.30.2