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

diff --cc drivers/base/regmap/regcache.c
index 5c5090b68939f842bce9ba58b9c42e3b960d2172,cccceb599b025b5e8b6a6fb8dac4f672d29ccecb..4170b7d952767074140ce26c4c1ac621823607ad
--- 1/drivers/base/regmap/regcache.c
--- 2/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 */