diff options
| -rw-r--r-- | drivers/dax/pmem.c | 3 | ||||
| -rw-r--r-- | drivers/nvdimm/claim.c | 2 | ||||
| -rw-r--r-- | drivers/nvdimm/pmem.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/drivers/dax/pmem.c b/drivers/dax/pmem.c index 9630d8837ba9..3ff84784249a 100644 --- a/drivers/dax/pmem.c +++ b/drivers/dax/pmem.c | |||
| @@ -87,7 +87,8 @@ static int dax_pmem_probe(struct device *dev) | |||
| 87 | pfn_sb = nd_pfn->pfn_sb; | 87 | pfn_sb = nd_pfn->pfn_sb; |
| 88 | 88 | ||
| 89 | if (!devm_request_mem_region(dev, nsio->res.start, | 89 | if (!devm_request_mem_region(dev, nsio->res.start, |
| 90 | resource_size(&nsio->res), dev_name(dev))) { | 90 | resource_size(&nsio->res), |
| 91 | dev_name(&ndns->dev))) { | ||
| 91 | dev_warn(dev, "could not reserve region %pR\n", &nsio->res); | 92 | dev_warn(dev, "could not reserve region %pR\n", &nsio->res); |
| 92 | return -EBUSY; | 93 | return -EBUSY; |
| 93 | } | 94 | } |
diff --git a/drivers/nvdimm/claim.c b/drivers/nvdimm/claim.c index 8d66fbb779ed..4638b9ea5229 100644 --- a/drivers/nvdimm/claim.c +++ b/drivers/nvdimm/claim.c | |||
| @@ -275,7 +275,7 @@ int devm_nsio_enable(struct device *dev, struct nd_namespace_io *nsio) | |||
| 275 | 275 | ||
| 276 | nsio->size = resource_size(res); | 276 | nsio->size = resource_size(res); |
| 277 | if (!devm_request_mem_region(dev, res->start, resource_size(res), | 277 | if (!devm_request_mem_region(dev, res->start, resource_size(res), |
| 278 | dev_name(dev))) { | 278 | dev_name(&ndns->dev))) { |
| 279 | dev_warn(dev, "could not reserve region %pR\n", res); | 279 | dev_warn(dev, "could not reserve region %pR\n", res); |
| 280 | return -EBUSY; | 280 | return -EBUSY; |
| 281 | } | 281 | } |
diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c index 42b3a8217073..34f16a17c07b 100644 --- a/drivers/nvdimm/pmem.c +++ b/drivers/nvdimm/pmem.c | |||
| @@ -266,7 +266,7 @@ static int pmem_attach_disk(struct device *dev, | |||
| 266 | dev_warn(dev, "unable to guarantee persistence of writes\n"); | 266 | dev_warn(dev, "unable to guarantee persistence of writes\n"); |
| 267 | 267 | ||
| 268 | if (!devm_request_mem_region(dev, res->start, resource_size(res), | 268 | if (!devm_request_mem_region(dev, res->start, resource_size(res), |
| 269 | dev_name(dev))) { | 269 | dev_name(&ndns->dev))) { |
| 270 | dev_warn(dev, "could not reserve region %pR\n", res); | 270 | dev_warn(dev, "could not reserve region %pR\n", res); |
| 271 | return -EBUSY; | 271 | return -EBUSY; |
| 272 | } | 272 | } |
