diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2011-11-14 10:40:17 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-14 21:46:25 +0000 |
| commit | bd061c78cabc28bb64ed79f784d24918b6bdb791 (patch) | |
| tree | 22cc4e766df7839257eaa893ada3b623d6201e09 /drivers/base/regmap/regcache.c | |
| parent | 021cd616decb4e8a4b31f1f8c466a847e8c04e67 (diff) | |
| download | linux-3.10-bd061c78cabc28bb64ed79f784d24918b6bdb791.tar.gz linux-3.10-bd061c78cabc28bb64ed79f784d24918b6bdb791.tar.bz2 linux-3.10-bd061c78cabc28bb64ed79f784d24918b6bdb791.zip | |
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/regmap/regcache.c')
| -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 79446262812..27fae58ff4c 100644 --- a/drivers/base/regmap/regcache.c +++ b/drivers/base/regmap/regcache.c @@ -144,9 +144,18 @@ int regcache_init(struct regmap *map) if (map->cache_ops->init) { dev_dbg(map->dev, "Initializing %s cache\n", map->cache_ops->name); - return map->cache_ops->init(map); + ret = map->cache_ops->init(map); + if (ret) + goto err_free; } return 0; + +err_free: + kfree(map->reg_defaults); + if (map->cache_free) + kfree(map->reg_defaults_raw); + + return ret; } void regcache_exit(struct regmap *map) |