Commit 7ff2b193 authored by Mark Brown's avatar Mark Brown

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

parents 8bb96604 bc8ce4af
...@@ -398,7 +398,7 @@ static int regcache_rbtree_sync(struct regmap *map, unsigned int min, ...@@ -398,7 +398,7 @@ static int regcache_rbtree_sync(struct regmap *map, unsigned int min,
base = 0; base = 0;
if (max < rbnode->base_reg + rbnode->blklen) if (max < rbnode->base_reg + rbnode->blklen)
end = rbnode->base_reg + rbnode->blklen - max; end = max - rbnode->base_reg + 1;
else else
end = rbnode->blklen; end = rbnode->blklen;
......
...@@ -943,8 +943,7 @@ static int _regmap_raw_write(struct regmap *map, unsigned int reg, ...@@ -943,8 +943,7 @@ static int _regmap_raw_write(struct regmap *map, unsigned int reg,
unsigned int ival; unsigned int ival;
int val_bytes = map->format.val_bytes; int val_bytes = map->format.val_bytes;
for (i = 0; i < val_len / val_bytes; i++) { for (i = 0; i < val_len / val_bytes; i++) {
memcpy(map->work_buf, val + (i * val_bytes), val_bytes); ival = map->format.parse_val(val + (i * val_bytes));
ival = map->format.parse_val(map->work_buf);
ret = regcache_write(map, reg + (i * map->reg_stride), ret = regcache_write(map, reg + (i * map->reg_stride),
ival); ival);
if (ret) { if (ret) {
......
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