summaryrefslogtreecommitdiffstats
path: root/drivers/nvdimm
diff options
context:
space:
mode:
authorLuis Chamberlain <mcgrof@kernel.org>2021-11-04 00:04:25 +0100
committerJens Axboe <axboe@kernel.dk>2021-11-04 12:48:49 +0100
commit16be7974ff5d0a5cd9f345571c3eac1c3f6ba6de (patch)
treec4cbdcee78e801b653a1087b7309677c7c3124b2 /drivers/nvdimm
parentnvdimm/btt: use goto error labels on btt_blk_init() (diff)
downloadlinux-16be7974ff5d0a5cd9f345571c3eac1c3f6ba6de.tar.xz
linux-16be7974ff5d0a5cd9f345571c3eac1c3f6ba6de.zip
nvdimm/btt: 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. Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Luis Chamberlain <mcgrof@kernel.org> Link: https://lore.kernel.org/r/20211103230437.1639990-3-mcgrof@kernel.org Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/nvdimm')
-rw-r--r--drivers/nvdimm/btt.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/nvdimm/btt.c b/drivers/nvdimm/btt.c
index 5cb6d7ac6e36..38ed53eeea5e 100644
--- a/drivers/nvdimm/btt.c
+++ b/drivers/nvdimm/btt.c
@@ -1541,7 +1541,9 @@ static int btt_blk_init(struct btt *btt)
}
set_capacity(btt->btt_disk, btt->nlba * btt->sector_size >> 9);
- device_add_disk(&btt->nd_btt->dev, btt->btt_disk, NULL);
+ rc = device_add_disk(&btt->nd_btt->dev, btt->btt_disk, NULL);
+ if (rc)
+ goto out_cleanup_disk;
btt->nd_btt->size = btt->nlba * (u64)btt->sector_size;
nvdimm_check_and_set_ro(btt->btt_disk);