diff options
| author |   Dan Williams <dan.j.williams@intel.com> | 2016-03-09 17:15:43 -0800 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2016-03-09 17:15:43 -0800 |
| commit | 489011652a2d5555901def04c24d68874e8ba9a1 (patch) | |
| tree | f4d000e5ae63350016d12e6ccb52b0809bb814df /drivers/nvdimm/e820.c | |
| parent | libnvdimm, pmem: clear poison on write (diff) | |
| parent | nvdimm/btt: don't allocate unused major device number (diff) | |
| download | linux-dev-489011652a2d5555901def04c24d68874e8ba9a1.tar.xz linux-dev-489011652a2d5555901def04c24d68874e8ba9a1.zip | |
Merge branch 'for-4.6/pfn' into libnvdimm-for-next
Diffstat (limited to 'drivers/nvdimm/e820.c')
| -rw-r--r-- | drivers/nvdimm/e820.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvdimm/e820.c b/drivers/nvdimm/e820.c index b0045a505dc8..95825b38559a 100644 --- a/drivers/nvdimm/e820.c +++ b/drivers/nvdimm/e820.c @@ -55,7 +55,7 @@ static int e820_pmem_probe(struct platform_device *pdev) for (p = iomem_resource.child; p ; p = p->sibling) { struct nd_region_desc ndr_desc; - if (strncmp(p->name, "Persistent Memory (legacy)", 26) != 0) + if (p->desc != IORES_DESC_PERSISTENT_MEMORY_LEGACY) continue; memset(&ndr_desc, 0, sizeof(ndr_desc)); |