diff options
Diffstat (limited to 'drivers/nvdimm/dax_devs.c')
| -rw-r--r-- | drivers/nvdimm/dax_devs.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/nvdimm/dax_devs.c b/drivers/nvdimm/dax_devs.c index 1bf2bd318371..0453f49dc708 100644 --- a/drivers/nvdimm/dax_devs.c +++ b/drivers/nvdimm/dax_devs.c | |||
| @@ -24,7 +24,7 @@ static void nd_dax_release(struct device *dev) | |||
| 24 | struct nd_dax *nd_dax = to_nd_dax(dev); | 24 | struct nd_dax *nd_dax = to_nd_dax(dev); |
| 25 | struct nd_pfn *nd_pfn = &nd_dax->nd_pfn; | 25 | struct nd_pfn *nd_pfn = &nd_dax->nd_pfn; |
| 26 | 26 | ||
| 27 | dev_dbg(dev, "%s\n", __func__); | 27 | dev_dbg(dev, "trace\n"); |
| 28 | nd_detach_ndns(dev, &nd_pfn->ndns); | 28 | nd_detach_ndns(dev, &nd_pfn->ndns); |
| 29 | ida_simple_remove(&nd_region->dax_ida, nd_pfn->id); | 29 | ida_simple_remove(&nd_region->dax_ida, nd_pfn->id); |
| 30 | kfree(nd_pfn->uuid); | 30 | kfree(nd_pfn->uuid); |
| @@ -129,8 +129,7 @@ int nd_dax_probe(struct device *dev, struct nd_namespace_common *ndns) | |||
| 129 | pfn_sb = devm_kzalloc(dev, sizeof(*pfn_sb), GFP_KERNEL); | 129 | pfn_sb = devm_kzalloc(dev, sizeof(*pfn_sb), GFP_KERNEL); |
| 130 | nd_pfn->pfn_sb = pfn_sb; | 130 | nd_pfn->pfn_sb = pfn_sb; |
| 131 | rc = nd_pfn_validate(nd_pfn, DAX_SIG); | 131 | rc = nd_pfn_validate(nd_pfn, DAX_SIG); |
| 132 | dev_dbg(dev, "%s: dax: %s\n", __func__, | 132 | dev_dbg(dev, "dax: %s\n", rc == 0 ? dev_name(dax_dev) : "<none>"); |
| 133 | rc == 0 ? dev_name(dax_dev) : "<none>"); | ||
| 134 | if (rc < 0) { | 133 | if (rc < 0) { |
| 135 | nd_detach_ndns(dax_dev, &nd_pfn->ndns); | 134 | nd_detach_ndns(dax_dev, &nd_pfn->ndns); |
| 136 | put_device(dax_dev); | 135 | put_device(dax_dev); |
