diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2016-12-18 00:08:10 +0100 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2016-12-18 00:08:10 +0100 |
| commit | c44ef859ceff45db1c72f9ccbfae96843c4b1501 (patch) | |
| tree | c97d8cab54f9d62faa5a5713298418ab93a452e0 /drivers/dax/pmem.c | |
| parent | device-dax: fix private mapping restriction, permit read-only (diff) | |
| parent | dax: add region 'id', 'size', and 'align' attributes (diff) | |
| download | linux-c44ef859ceff45db1c72f9ccbfae96843c4b1501.tar.xz linux-c44ef859ceff45db1c72f9ccbfae96843c4b1501.zip | |
Merge branch 'for-4.10/libnvdimm' into libnvdimm-for-next
Diffstat (limited to 'drivers/dax/pmem.c')
| -rw-r--r-- | drivers/dax/pmem.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/dax/pmem.c b/drivers/dax/pmem.c index 73c6ce93a0d9..033f49b31fdc 100644 --- a/drivers/dax/pmem.c +++ b/drivers/dax/pmem.c @@ -89,7 +89,8 @@ static int dax_pmem_probe(struct device *dev) pfn_sb = nd_pfn->pfn_sb; if (!devm_request_mem_region(dev, nsio->res.start, - resource_size(&nsio->res), dev_name(dev))) { + resource_size(&nsio->res), + dev_name(&ndns->dev))) { dev_warn(dev, "could not reserve region %pR\n", &nsio->res); return -EBUSY; } |