summaryrefslogtreecommitdiffstats
path: root/drivers/base/regmap/regcache-rbtree.c
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2011-11-15 13:34:40 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-11-15 19:22:59 +0000
commit462a185c5cea7063348003c1644b70a6f6780f01 (patch)
treeea7bac0e1c53a745fc41e12142cadf6b334d42bf /drivers/base/regmap/regcache-rbtree.c
parentbd061c78cabc28bb64ed79f784d24918b6bdb791 (diff)
downloadblackbird-op-linux-462a185c5cea7063348003c1644b70a6f6780f01.tar.gz
blackbird-op-linux-462a185c5cea7063348003c1644b70a6f6780f01.zip
regmap: Do not call regcache_exit from regcache_rbtree_init error path
Calling regcache_exit from regcache_rbtree_init is first of all a layering violation and secondly will cause double frees. regcache_exit will free buffers allocated by the core, but the core will also free the same buffers when the cacheops init callback returns an error. Thus we end up with a double free. Fix this by not calling regcache_exit but only free those buffers which, have been allocated in this function. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Acked-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/base/regmap/regcache-rbtree.c')
-rw-r--r--drivers/base/regmap/regcache-rbtree.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/base/regmap/regcache-rbtree.c b/drivers/base/regmap/regcache-rbtree.c
index e31498499b0f..e71320f61d18 100644
--- a/drivers/base/regmap/regcache-rbtree.c
+++ b/drivers/base/regmap/regcache-rbtree.c
@@ -17,6 +17,7 @@
static int regcache_rbtree_write(struct regmap *map, unsigned int reg,
unsigned int value);
+static int regcache_rbtree_exit(struct regmap *map);
struct regcache_rbtree_node {
/* the actual rbtree node holding this block */
@@ -149,7 +150,7 @@ static int regcache_rbtree_init(struct regmap *map)
return 0;
err:
- regcache_exit(map);
+ regcache_rbtree_exit(map);
return ret;
}
OpenPOWER on IntegriCloud