mtd: add add_disk() error handling
authorLuis Chamberlain <mcgrof@kernel.org>
Fri, 15 Oct 2021 23:30:28 +0000 (16:30 -0700)
committerJens Axboe <axboe@kernel.dk>
Thu, 21 Oct 2021 15:00:56 +0000 (09:00 -0600)
We never checked for errors on add_disk() as this function
returned void. Now that this is fixed, use the shiny new
error handling.

Acked-by: Miquel Raynal <miquel.raynal@bootlin.com>
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
Link: https://lore.kernel.org/r/20211015233028.2167651-10-mcgrof@kernel.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/mtd/mtd_blkdevs.c

index b8ae1ec..4eaba6f 100644 (file)
@@ -384,7 +384,9 @@ int add_mtd_blktrans_dev(struct mtd_blktrans_dev *new)
        if (new->readonly)
                set_disk_ro(gd, 1);
 
-       device_add_disk(&new->mtd->dev, gd, NULL);
+       ret = device_add_disk(&new->mtd->dev, gd, NULL);
+       if (ret)
+               goto out_cleanup_disk;
 
        if (new->disk_attributes) {
                ret = sysfs_create_group(&disk_to_dev(gd)->kobj,
@@ -393,6 +395,8 @@ int add_mtd_blktrans_dev(struct mtd_blktrans_dev *new)
        }
        return 0;
 
+out_cleanup_disk:
+       blk_cleanup_disk(new->disk);
 out_free_tag_set:
        blk_mq_free_tag_set(new->tag_set);
 out_kfree_tag_set: