moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

memstick: ms_block: Add error handling support for add_disk()

Browse Source 
[ Upstream commit 2304c55fd506fcd5e1a59ae21a306ee82507340b ]

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>
Link: https://lore.kernel.org/r/20210902174105.2418771-3-mcgrof@kernel.org
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Stable-dep-of: 4f431a047a5c ("memstick/ms_block: Add check for alloc_ordered_workqueue")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Luis Chamberlain
2021-09-02 10:40:58 -07:00
committed by Greg Kroah-Hartman
parent ae00eb6779
commit b77ced3fce
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/memstick/core/ms_block.c
View File

@@ -2157,10 +2157,14 @@ static int msb_init_disk(struct memstick_dev *card)
set_disk_ro(msb->disk, 1); set_disk_ro(msb->disk, 1);
msb_start(card); 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"); dbg("Disk added");
return 0; return 0;
out_cleanup_disk:
blk_cleanup_disk(msb->disk);
out_free_tag_set: out_free_tag_set:
blk_mq_free_tag_set(&msb->tag_set); blk_mq_free_tag_set(&msb->tag_set);
out_release_id: out_release_id: