Re: [PATCH 3/9] mspro_block: add error handling support for add_disk()

Ulf Hansson
2021-09-06T17:11:10Z

On Thu, 2 Sept 2021 at 19:41, Luis Chamberlain <mcgrof@kernel.org> wrote:
>
> 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>

Queued for v5.16 on the temporary devel branch, thanks!

Kind regards
Uffe

> ---
> drivers/memstick/core/mspro_block.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/memstick/core/mspro_block.c b/drivers/memstick/core/mspro_block.c
> index 22778d0e24f5..c0450397b673 100644
> --- a/drivers/memstick/core/mspro_block.c
> +++ b/drivers/memstick/core/mspro_block.c
> @@ -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:
> --
> 2.30.2
>