Commit 28176ab6 authored by Mark Brown's avatar Mark Brown

Merge remote-tracking branch 'regmap/fix/cache' into regmap-linus

parents fc14f9c1 439e8211
...@@ -44,7 +44,7 @@ static int regcache_hw_init(struct regmap *map) ...@@ -44,7 +44,7 @@ static int regcache_hw_init(struct regmap *map)
map->cache_bypass = 1; map->cache_bypass = 1;
tmp_buf = kmalloc(map->cache_size_raw, GFP_KERNEL); tmp_buf = kmalloc(map->cache_size_raw, GFP_KERNEL);
if (!tmp_buf) if (!tmp_buf)
return -EINVAL; return -ENOMEM;
ret = regmap_raw_read(map, 0, tmp_buf, ret = regmap_raw_read(map, 0, tmp_buf,
map->num_reg_defaults_raw); map->num_reg_defaults_raw);
map->cache_bypass = cache_bypass; map->cache_bypass = cache_bypass;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment