diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2016-05-21 12:33:04 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2016-05-21 12:33:04 -0700 |
| commit | 36092ee8ba695fce023b2118ececa6c2a56b1331 (patch) | |
| tree | b9579893cdd559e7b72fa569003b19792de58fad /drivers/nvdimm/pmem.c | |
| parent | 1b982baf75e7d9585967fcfccd05b77bf9054010 (diff) | |
| parent | 03dca343afe080968d90c4d9196404b5bbbc8461 (diff) | |
Merge branch 'for-4.7/dax' into libnvdimm-for-nextlibnvdimm-for-4.7
Diffstat (limited to 'drivers/nvdimm/pmem.c')
| -rw-r--r-- | drivers/nvdimm/pmem.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c index d9a0dbc2d023..042baec56931 100644 --- a/drivers/nvdimm/pmem.c +++ b/drivers/nvdimm/pmem.c @@ -320,7 +320,8 @@ static int nd_pmem_probe(struct device *dev) return pmem_attach_disk(dev, ndns); /* if we find a valid info-block we'll come back as that personality */ - if (nd_btt_probe(dev, ndns) == 0 || nd_pfn_probe(dev, ndns) == 0) + if (nd_btt_probe(dev, ndns) == 0 || nd_pfn_probe(dev, ndns) == 0 + || nd_dax_probe(dev, ndns) == 0) return -ENXIO; /* ...otherwise we're just a raw pmem device */ |