diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2011-11-14 04:40:17 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-14 16:46:25 -0500 |
commit | bd061c78cabc28bb64ed79f784d24918b6bdb791 (patch) | |
tree | 22cc4e766df7839257eaa893ada3b623d6201e09 /drivers/base | |
parent | 021cd616decb4e8a4b31f1f8c466a847e8c04e67 (diff) |
regmap: Fix memory leak in regcache_init error path
Make sure all allocated memory gets freed again in case initializing the cache
failed.
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')
-rw-r--r-- | drivers/base/regmap/regcache.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c index 79446262812c..27fae58ff4cb 100644 --- a/drivers/base/regmap/regcache.c +++ b/drivers/base/regmap/regcache.c | |||
@@ -144,9 +144,18 @@ int regcache_init(struct regmap *map) | |||
144 | if (map->cache_ops->init) { | 144 | if (map->cache_ops->init) { |
145 | dev_dbg(map->dev, "Initializing %s cache\n", | 145 | dev_dbg(map->dev, "Initializing %s cache\n", |
146 | map->cache_ops->name); | 146 | map->cache_ops->name); |
147 | return map->cache_ops->init(map); | 147 | ret = map->cache_ops->init(map); |
148 | if (ret) | ||
149 | goto err_free; | ||
148 | } | 150 | } |
149 | return 0; | 151 | return 0; |
152 | |||
153 | err_free: | ||
154 | kfree(map->reg_defaults); | ||
155 | if (map->cache_free) | ||
156 | kfree(map->reg_defaults_raw); | ||
157 | |||
158 | return ret; | ||
150 | } | 159 | } |
151 | 160 | ||
152 | void regcache_exit(struct regmap *map) | 161 | void regcache_exit(struct regmap *map) |