Merge remote-tracking branch 'regmap/fix/core' into tmp

6d66df41 · Mark Brown · 7ff2b193 · c6432ea9 · 6d66df41
Commit 6d66df41 authored Mar 31, 2013 by Mark Brown
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

drivers/base/regmap/regmap.c drivers/base/regmap/regmap.c +2 -2

No files found.
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -710,12 +710,12 @@ struct regmap *regmap_init(struct device *dev,
 		}
 	}

+	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) {