Merge drm/drm-next into drm-misc-next

[linux.git] / drivers / nvdimm / of_pmem.c

diff --git a/drivers/nvdimm/of_pmem.c b/drivers/nvdimm/of_pmem.c
index a0c8dcfa0bf923cc1e8a1b2ffacb74f2f801d681..97187d6c0bdb00ee2de3e085edea9f8337546863 100644 (file)
--- a/drivers/nvdimm/of_pmem.c
+++ b/drivers/nvdimm/of_pmem.c
@@ -42,7 +42,7 @@ static int of_pmem_region_probe(struct platform_device *pdev)
                return -ENOMEM;
 
        priv->bus_desc.attr_groups = bus_attr_groups;
-       priv->bus_desc.provider_name = "of_pmem";
+       priv->bus_desc.provider_name = kstrdup(pdev->name, GFP_KERNEL);
        priv->bus_desc.module = THIS_MODULE;
        priv->bus_desc.of_node = np;