diff options
| author | Mark Brown <broonie@kernel.org> | 2026-10-08 11:39:13 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-10-08 11:39:13 +0200 |
| commit | 03fff5fa17d04161fa73deb47c87642e7aa0bc27 (patch) | |
| tree | 649f0a40333389f06147b10ef32894f59ae117e9 | |
| parent | dc22cb16c9bcd4733485eb30369ee621b2fdfbaf (diff) | |
| parent | 855a46681e0ba601952c346e5b62d867e51ecb23 (diff) | |
| download | linux-next-03fff5fa17d04161fa73deb47c87642e7aa0bc27.tar.gz linux-next-03fff5fa17d04161fa73deb47c87642e7aa0bc27.zip | |
Merge branch 'libnvdimm-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git
| -rw-r--r-- | drivers/nvdimm/pmem.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c index 5fb86595e8bd..0766a6949b28 100644 --- a/drivers/nvdimm/pmem.c +++ b/drivers/nvdimm/pmem.c @@ -563,8 +563,10 @@ static int pmem_attach_disk(struct device *dev, nvdimm_namespace_disk_name(ndns, disk->disk_name); set_capacity(disk, (pmem->size - pmem->pfn_pad - pmem->data_offset) / 512); - if (devm_init_badblocks(dev, &pmem->bb)) - return -ENOMEM; + if (devm_init_badblocks(dev, &pmem->bb)) { + rc = -ENOMEM; + goto out; + } nvdimm_badblocks_populate(nd_region, &pmem->bb, &bb_range); disk->bb = &pmem->bb; |