diff options
author | Dan Williams <dan.j.williams@intel.com> | 2016-12-17 15:08:10 -0800 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2016-12-17 15:08:10 -0800 |
commit | c44ef859ceff45db1c72f9ccbfae96843c4b1501 (patch) | |
tree | c97d8cab54f9d62faa5a5713298418ab93a452e0 /drivers/nvdimm/label.c | |
parent | 325896ffdf90f7cbd59fb873b7ba20d60d1ddf3c (diff) | |
parent | d7fe1a67f658b50ec98ee1afb86df7b35c2b2593 (diff) |
Merge branch 'for-4.10/libnvdimm' into libnvdimm-for-nextlibnvdimm-for-4.10
Diffstat (limited to 'drivers/nvdimm/label.c')
-rw-r--r-- | drivers/nvdimm/label.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvdimm/label.c b/drivers/nvdimm/label.c index fac7cabe8f56..dd615345699f 100644 --- a/drivers/nvdimm/label.c +++ b/drivers/nvdimm/label.c @@ -938,7 +938,7 @@ int nd_pmem_namespace_label_update(struct nd_region *nd_region, } for_each_dpa_resource(ndd, res) - if (strncmp(res->name, "pmem", 3) == 0) + if (strncmp(res->name, "pmem", 4) == 0) count++; WARN_ON_ONCE(!count); |