Commit b3f8eb6e authored by Luis Chamberlain's avatar Luis Chamberlain Committed by Ulf Hansson
Browse files

memstick: mspro_block: 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.

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: default avatarLuis Chamberlain <mcgrof@kernel.org>
Link: https://lore.kernel.org/r/20210902174105.2418771-4-mcgrof@kernel.org


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 2304c55f

drivers/memstick/core/mspro_block.c

+5 −1
Original line number Diff line number Diff line
@@ -1239,10 +1239,14 @@ static int mspro_block_init_disk(struct memstick_dev *card) 
	set_capacity(msb->disk, capacity);

	dev_dbg(&card->dev, "capacity set %ld\n", capacity);



	device_add_disk(&card->dev, msb->disk, NULL);

	rc = device_add_disk(&card->dev, msb->disk, NULL);

	if (rc)

		goto out_cleanup_disk;

	msb->active = 1;

	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: