diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-31 18:09:22 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-31 18:09:22 -0400 |
commit | 6d66df41098b84cba9b26772c09d90a108459c39 (patch) | |
tree | 68f1cba5cbc6b346ad63eedab568d6818bf8eb01 | |
parent | 7ff2b193594a358d4e91031af98211e0da6c6c87 (diff) | |
parent | c6432ea9cc043994d5b7dcb3ad86a087777cb40c (diff) |
Merge remote-tracking branch 'regmap/fix/core' into tmp
-rw-r--r-- | drivers/base/regmap/regmap.c | 4 |
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: | |||
710 | } | 710 | } |
711 | } | 711 | } |
712 | 712 | ||
713 | regmap_debugfs_init(map, config->name); | ||
714 | |||
713 | ret = regcache_init(map, config); | 715 | ret = regcache_init(map, config); |
714 | if (ret != 0) | 716 | if (ret != 0) |
715 | goto err_range; | 717 | goto err_range; |
716 | 718 | ||
717 | regmap_debugfs_init(map, config->name); | ||
718 | |||
719 | /* Add a devres resource for dev_get_regmap() */ | 719 | /* Add a devres resource for dev_get_regmap() */ |
720 | m = devres_alloc(dev_get_regmap_release, sizeof(*m), GFP_KERNEL); | 720 | m = devres_alloc(dev_get_regmap_release, sizeof(*m), GFP_KERNEL); |
721 | if (!m) { | 721 | if (!m) { |