diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2016-05-18 20:06:59 +0300 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2016-05-18 20:06:59 +0300 |
| commit | 1f716d05f8daee4f393dc568ea7a53c7ecfd0bfc (patch) | |
| tree | 3ba46ef65cd2fb1766934769c1d4a7fc16c3fe61 /drivers/nvdimm/core.c | |
| parent | 2159669f581917c4d197d3ea183d3d85b47faf66 (diff) | |
| parent | a94e3fbe4d53d4e512c4ea88a475e605b8d8dccb (diff) | |
| download | linux-1f716d05f8daee4f393dc568ea7a53c7ecfd0bfc.tar.xz | |
Merge branch 'for-4.7/dsm' into libnvdimm-for-next
Diffstat (limited to 'drivers/nvdimm/core.c')
| -rw-r--r-- | drivers/nvdimm/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvdimm/core.c b/drivers/nvdimm/core.c index 182a93fe3712..e8688a13cf4f 100644 --- a/drivers/nvdimm/core.c +++ b/drivers/nvdimm/core.c @@ -251,7 +251,7 @@ static ssize_t commands_show(struct device *dev, struct nvdimm_bus *nvdimm_bus = to_nvdimm_bus(dev); struct nvdimm_bus_descriptor *nd_desc = nvdimm_bus->nd_desc; - for_each_set_bit(cmd, &nd_desc->dsm_mask, BITS_PER_LONG) + for_each_set_bit(cmd, &nd_desc->cmd_mask, BITS_PER_LONG) len += sprintf(buf + len, "%s ", nvdimm_bus_cmd_name(cmd)); len += sprintf(buf + len, "\n"); return len; |