projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'regmap/fix/raw' into regmap-linus
[cascardo/linux.git]
/
drivers
/
base
/
regmap
/
regcache.c
diff --git
a/drivers/base/regmap/regcache.c
b/drivers/base/regmap/regcache.c
index
348be3a
..
5c5090b
100644
(file)
--- a/
drivers/base/regmap/regcache.c
+++ b/
drivers/base/regmap/regcache.c
@@
-57,7
+57,7
@@
static int regcache_hw_init(struct regmap *map)
bool cache_bypass = map->cache_bypass;
dev_warn(map->dev, "No cache defaults, reading back from HW\n");
bool cache_bypass = map->cache_bypass;
dev_warn(map->dev, "No cache defaults, reading back from HW\n");
- /* Bypass the cache access till data read from HW*/
+ /* Bypass the cache access till data read from HW
*/
map->cache_bypass = true;
tmp_buf = kmalloc(map->cache_size_raw, GFP_KERNEL);
if (!tmp_buf) {
map->cache_bypass = true;
tmp_buf = kmalloc(map->cache_size_raw, GFP_KERNEL);
if (!tmp_buf) {
@@
-65,7
+65,7
@@
static int regcache_hw_init(struct regmap *map)
goto err_free;
}
ret = regmap_raw_read(map, 0, tmp_buf,
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->cache_bypass = cache_bypass;
if (ret < 0)
goto err_cache_free;