summaryrefslogtreecommitdiff
path: root/drivers/nvdimm
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-09-12 10:15:26 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-09-12 10:15:26 +0300
commitfc9104d5d7172d2cb6c672abeb964242aa735b34 (patch)
tree87f8aedceff2d578b073d33791e4696a7aba9185 /drivers/nvdimm
parentab57f86198d6ff20371613d4a02fd4841972a5c0 (diff)
parent9395452b4aab7bc2475ef8935b4a4fb99d778d70 (diff)
downloadlinux-fc9104d5d7172d2cb6c672abeb964242aa735b34.tar.xz
Merge 4.8-rc6 into usb-next
We want the USB fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/nvdimm')
-rw-r--r--drivers/nvdimm/bus.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/nvdimm/bus.c b/drivers/nvdimm/bus.c
index 458daf927336..935866fe5ec2 100644
--- a/drivers/nvdimm/bus.c
+++ b/drivers/nvdimm/bus.c
@@ -185,8 +185,12 @@ long nvdimm_clear_poison(struct device *dev, phys_addr_t phys,
return -ENXIO;
nd_desc = nvdimm_bus->nd_desc;
+ /*
+ * if ndctl does not exist, it's PMEM_LEGACY and
+ * we want to just pretend everything is handled.
+ */
if (!nd_desc->ndctl)
- return -ENXIO;
+ return len;
memset(&ars_cap, 0, sizeof(ars_cap));
ars_cap.address = phys;