summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2016-01-30 02:42:51 +0100
committerDan Williams <dan.j.williams@intel.com>2016-01-30 02:43:16 +0100
commit45eb570a0db3391c88cba04510a20fe7e4125497 (patch)
tree37091e4a46c4f854cb85008cd0a8156ad565111c /drivers
parentlibnvdimm: fix mode determination for e820 devices (diff)
downloadlinux-45eb570a0db3391c88cba04510a20fe7e4125497.tar.xz
linux-45eb570a0db3391c88cba04510a20fe7e4125497.zip
libnvdimm, pfn: fix restoring memmap location
This path was missed when turning on the memmap in pmem support. Permit 'pmem' as a valid location for the map. Reported-by: Jeff Moyer <jmoyer@redhat.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/nvdimm/pfn_devs.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/nvdimm/pfn_devs.c b/drivers/nvdimm/pfn_devs.c
index 0cc9048b86e2..ae81a2f1da50 100644
--- a/drivers/nvdimm/pfn_devs.c
+++ b/drivers/nvdimm/pfn_devs.c
@@ -301,10 +301,8 @@ int nd_pfn_validate(struct nd_pfn *nd_pfn)
switch (le32_to_cpu(pfn_sb->mode)) {
case PFN_MODE_RAM:
- break;
case PFN_MODE_PMEM:
- /* TODO: allocate from PMEM support */
- return -ENOTTY;
+ break;
default:
return -ENXIO;
}