diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-11-11 08:25:07 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-11-11 08:25:07 +0100 |
| commit | 4c8ee71620d734c8ad129fad085167f56f9ce351 (patch) | |
| tree | 87208b0144aa664c96dd8b43bbcaaf1f25af606b /drivers/nvdimm/namespace_devs.c | |
| parent | c7faee2109f978f3ef826c48b7e60609061fda4f (diff) | |
| parent | 27bcd37e0240bbe33f0efe244b5aad52104115b3 (diff) | |
Merge branch 'linus' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/nvdimm/namespace_devs.c')
| -rw-r--r-- | drivers/nvdimm/namespace_devs.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/nvdimm/namespace_devs.c b/drivers/nvdimm/namespace_devs.c index 3509cff68ef9..abe5c6bc756c 100644 --- a/drivers/nvdimm/namespace_devs.c +++ b/drivers/nvdimm/namespace_devs.c @@ -2176,12 +2176,14 @@ static struct device **scan_labels(struct nd_region *nd_region) return devs; err: - for (i = 0; devs[i]; i++) - if (is_nd_blk(&nd_region->dev)) - namespace_blk_release(devs[i]); - else - namespace_pmem_release(devs[i]); - kfree(devs); + if (devs) { + for (i = 0; devs[i]; i++) + if (is_nd_blk(&nd_region->dev)) + namespace_blk_release(devs[i]); + else + namespace_pmem_release(devs[i]); + kfree(devs); + } return NULL; } |