regmap: Fix memory leak in regcache_hw_init error path

Make sure reg_defaults_raw gets freed in case of an error.

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>

1 files changed, 10 insertions, 2 deletions

diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c
index 6ab9f0384d82..79446262812c 100644
--- a/drivers/base/regmap/regcache.c
+++ b/drivers/base/regmap/regcache.c
@@ -61,8 +61,10 @@ static int regcache_hw_init(struct regmap *map)
 
         map->reg_defaults = kmalloc(count * sizeof(struct reg_default),
                                       GFP_KERNEL);
-        if (!map->reg_defaults)
-                return -ENOMEM;
+        if (!map->reg_defaults) {
+                ret = -ENOMEM;
+                goto err_free;
+        }
 
         /* fill the reg_defaults */
         map->num_reg_defaults = count;
@@ -77,6 +79,12 @@ static int regcache_hw_init(struct regmap *map)
         }
 
         return 0;
+
+err_free:
+        if (map->cache_free)
+                kfree(map->reg_defaults_raw);
+
+        return ret;
 }
 
 int regcache_init(struct regmap *map)