projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'spi/topic/core' into spi-next
[cascardo/linux.git]
/
drivers
/
nvdimm
/
bus.c
diff --git
a/drivers/nvdimm/bus.c
b/drivers/nvdimm/bus.c
index
458daf9
..
935866f
100644
(file)
--- 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;
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)
if (!nd_desc->ndctl)
- return
-ENXIO
;
+ return
len
;
memset(&ars_cap, 0, sizeof(ars_cap));
ars_cap.address = phys;
memset(&ars_cap, 0, sizeof(ars_cap));
ars_cap.address = phys;