mmc: 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.

The caller only cleanups the disk if we pass on an allocated md but on
error we return return ERR_PTR(ret), and so we must do all the unwinding
ourselves.

Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
Link: https://lore.kernel.org/r/20210830212538.148729-5-mcgrof@kernel.org
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c
index 431af5e..61590cf 100644 (file)
--- a/drivers/mmc/core/block.c
+++ b/drivers/mmc/core/block.c
@@ -2442,9 +2442,14 @@ static struct mmc_blk_data *mmc_blk_alloc_req(struct mmc_card *card,
        /* used in ->open, must be set before add_disk: */
        if (area_type == MMC_BLK_DATA_AREA_MAIN)
                dev_set_drvdata(&card->dev, md);
-       device_add_disk(md->parent, md->disk, mmc_disk_attr_groups);
+       ret = device_add_disk(md->parent, md->disk, mmc_disk_attr_groups);
+       if (ret)
+               goto err_cleanup_queue;
        return md;
 
+ err_cleanup_queue:
+       blk_cleanup_queue(md->disk->queue);
+       blk_mq_free_tag_set(&md->queue.tag_set);
  err_kfree:
        kfree(md);
  out: