Merge tag 'arc-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc

[karo-tx-linux.git] / drivers / base / regmap / regmap-debugfs.c

diff --git a/drivers/base/regmap/regmap-debugfs.c b/drivers/base/regmap/regmap-debugfs.c
index 0c94b661c16f87da22f1ed90a0c1d3512bcaf69e..5799a0b9e6cc4168168bef46d864fbbe0db4020e 100644 (file)
--- a/drivers/base/regmap/regmap-debugfs.c
+++ b/drivers/base/regmap/regmap-debugfs.c
@@ -473,6 +473,7 @@ void regmap_debugfs_init(struct regmap *map, const char *name)
 {
        struct rb_node *next;
        struct regmap_range_node *range_node;
+       const char *devname = "dummy";
 
        /* If we don't have the debugfs root yet, postpone init */
        if (!regmap_debugfs_root) {
@@ -491,12 +492,15 @@ void regmap_debugfs_init(struct regmap *map, const char *name)
        INIT_LIST_HEAD(&map->debugfs_off_cache);
        mutex_init(&map->cache_lock);
 
+       if (map->dev)
+               devname = dev_name(map->dev);
+
        if (name) {
                map->debugfs_name = kasprintf(GFP_KERNEL, "%s-%s",
-                                             dev_name(map->dev), name);
+                                             devname, name);
                name = map->debugfs_name;
        } else {
-               name = dev_name(map->dev);
+               name = devname;
        }
 
        map->debugfs = debugfs_create_dir(name, regmap_debugfs_root);