summaryrefslogtreecommitdiffstats
path: root/drivers/base/regmap/regmap.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-16 16:02:41 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-16 16:02:41 +0100
commit60f7110e36ff7858182e8990a2d19fa3df7e05f5 (patch)
tree179c2a9f8fe654694d40536a506345db80705436 /drivers/base/regmap/regmap.c
parent9659293c1784f3d9df2235f6ebf92f6f9059a563 (diff)
parent41ef2d5678d83af030125550329b6ae8b74618fa (diff)
downloadlinux-60f7110e36ff7858182e8990a2d19fa3df7e05f5.tar.bz2
Merge tag 'v3.9-rc7' into regmap-cache
Linux 3.9-rc7
Diffstat (limited to 'drivers/base/regmap/regmap.c')
-rw-r--r--drivers/base/regmap/regmap.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 9ab1e1fedbc9..940fc63ed5f2 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -730,12 +730,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) {
@@ -1056,6 +1056,8 @@ int _regmap_raw_write(struct regmap *map, unsigned int reg,
kfree(async->work_buf);
kfree(async);
}
+
+ return ret;
}
trace_regmap_hw_write_start(map->dev, reg,