diff options
| author | Mark Brown <broonie@kernel.org> | 2018-05-21 19:17:37 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-05-21 19:17:37 +0100 |
| commit | 08556e03ad36b2c6219aba90de88ccf58038e208 (patch) | |
| tree | 1619cc5f466534b66b351985526e82da32b52028 /drivers/nvdimm/namespace_devs.c | |
| parent | d1480f9b535fa3901b7f303959bc196b304472a9 (diff) | |
| parent | 6ba89b52ba6916bc7a3d390d70951e992c0ca39e (diff) | |
Merge tag 'v4.9.101' into linux-linaro-lsk-v4.9
This is the 4.9.101 stable release
Diffstat (limited to 'drivers/nvdimm/namespace_devs.c')
| -rw-r--r-- | drivers/nvdimm/namespace_devs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/nvdimm/namespace_devs.c b/drivers/nvdimm/namespace_devs.c index b8fb1ef1fc15..74257ac92490 100644 --- a/drivers/nvdimm/namespace_devs.c +++ b/drivers/nvdimm/namespace_devs.c @@ -1747,7 +1747,7 @@ struct device *create_namespace_pmem(struct nd_region *nd_region, } if (i < nd_region->ndr_mappings) { - struct nvdimm_drvdata *ndd = to_ndd(&nd_region->mapping[i]); + struct nvdimm *nvdimm = nd_region->mapping[i].nvdimm; /* * Give up if we don't find an instance of a uuid at each @@ -1755,7 +1755,7 @@ struct device *create_namespace_pmem(struct nd_region *nd_region, * find a dimm with two instances of the same uuid. */ dev_err(&nd_region->dev, "%s missing label for %pUb\n", - dev_name(ndd->dev), nd_label->uuid); + nvdimm_name(nvdimm), nd_label->uuid); rc = -EINVAL; goto err; } |