From: Luis Chamberlain Date: Mon, 27 Sep 2021 22:02:32 +0000 (-0700) Subject: s390/block/scm_blk: add error handling support for add_disk() X-Git-Tag: v5.16-rc1~104^2~49 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f367c7d9fb326996862f6b5cf2aff7a2df64692d;p=thirdparty%2Flinux.git s390/block/scm_blk: 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. Acked-by: Heiko Carstens Signed-off-by: Luis Chamberlain Link: https://lore.kernel.org/r/20210927220232.1071926-7-mcgrof@kernel.org Signed-off-by: Heiko Carstens Signed-off-by: Vasily Gorbik --- diff --git a/drivers/s390/block/scm_blk.c b/drivers/s390/block/scm_blk.c index 88cba6212ee26..61ecdcb2cc6af 100644 --- a/drivers/s390/block/scm_blk.c +++ b/drivers/s390/block/scm_blk.c @@ -495,9 +495,14 @@ int scm_blk_dev_setup(struct scm_blk_dev *bdev, struct scm_device *scmdev) /* 512 byte sectors */ set_capacity(bdev->gendisk, scmdev->size >> 9); - device_add_disk(&scmdev->dev, bdev->gendisk, NULL); + ret = device_add_disk(&scmdev->dev, bdev->gendisk, NULL); + if (ret) + goto out_cleanup_disk; + return 0; +out_cleanup_disk: + blk_cleanup_disk(bdev->gendisk); out_tag: blk_mq_free_tag_set(&bdev->tag_set); out: