From: Mark Brown <broonie@kernel.org>
Date: Sat, 5 Mar 2016 12:30:29 +0000 (+0900)
Subject: Merge remote-tracking branch 'regmap/topic/mmio' into regmap-next
X-Git-Tag: v4.6-rc1~147^2~2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=781aab8457610d0b4d60cd85bb22e609941be721;p=linux-2.6-block.git

Merge remote-tracking branch 'regmap/topic/mmio' into regmap-next
---

781aab8457610d0b4d60cd85bb22e609941be721
diff --cc drivers/base/regmap/regcache.c
index 5c5090b68939,cccceb599b02..4170b7d95276
--- a/drivers/base/regmap/regcache.c
+++ b/drivers/base/regmap/regcache.c
@@@ -65,13 -65,14 +65,14 @@@ static int regcache_hw_init(struct regm
  			goto err_free;
  		}
  		ret = regmap_raw_read(map, 0, tmp_buf,
 -				      map->num_reg_defaults_raw);
 +				      map->cache_size_raw);
  		map->cache_bypass = cache_bypass;
- 		if (ret < 0)
- 			goto err_cache_free;
- 
- 		map->reg_defaults_raw = tmp_buf;
- 		map->cache_free = 1;
+ 		if (ret == 0) {
+ 			map->reg_defaults_raw = tmp_buf;
+ 			map->cache_free = 1;
+ 		} else {
+ 			kfree(tmp_buf);
+ 		}
  	}
  
  	/* fill the reg_defaults */