From e3c5efbf06f00d241de0b2b3290cfec4b05afd0c Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Mon, 14 Nov 2011 10:40:17 +0100 Subject: [PATCH] --- yaml --- r: 280540 b: refs/heads/master c: bd061c78cabc28bb64ed79f784d24918b6bdb791 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/base/regmap/regcache.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 5b5cca3640a2..4347cf46cea5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 021cd616decb4e8a4b31f1f8c466a847e8c04e67 +refs/heads/master: bd061c78cabc28bb64ed79f784d24918b6bdb791 diff --git a/trunk/drivers/base/regmap/regcache.c b/trunk/drivers/base/regmap/regcache.c index 79446262812c..27fae58ff4cb 100644 --- a/trunk/drivers/base/regmap/regcache.c +++ b/trunk/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)