summaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-03-31 23:09:22 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-03-31 23:09:22 +0100
commit6d66df41098b84cba9b26772c09d90a108459c39 (patch)
tree68f1cba5cbc6b346ad63eedab568d6818bf8eb01 /drivers/base
parent7ff2b193594a358d4e91031af98211e0da6c6c87 (diff)
parentc6432ea9cc043994d5b7dcb3ad86a087777cb40c (diff)
downloadlinux-6d66df41098b84cba9b26772c09d90a108459c39.tar.bz2
Merge remote-tracking branch 'regmap/fix/core' into tmp
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/regmap/regmap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 89a920510e1d..7008f744c00d 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -710,12 +710,12 @@ skip_format_initialization:
}
}
+ regmap_debugfs_init(map, config->name);
+
ret = regcache_init(map, config);
if (ret != 0)
goto err_range;
- regmap_debugfs_init(map, config->name);
-
/* Add a devres resource for dev_get_regmap() */
m = devres_alloc(dev_get_regmap_release, sizeof(*m), GFP_KERNEL);
if (!m) {