Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[karo-tx-linux.git] / drivers / nvdimm / core.c

diff --git a/drivers/nvdimm/core.c b/drivers/nvdimm/core.c
index 182a93fe37128d87d53b3c77d121ca28bb3ec8fd..be89764315c2b54d9bbe9548fc3f6183d6032ea4 100644 (file)
--- 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;
@@ -648,6 +648,9 @@ static __exit void libnvdimm_exit(void)
        nd_region_exit();
        nvdimm_exit();
        nvdimm_bus_exit();
+       nd_region_devs_exit();
+       nvdimm_devs_exit();
+       ida_destroy(&nd_ida);
 }
 
 MODULE_LICENSE("GPL v2");