diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-31 23:09:20 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-31 23:09:20 +0100 |
| commit | 7ff2b193594a358d4e91031af98211e0da6c6c87 (patch) | |
| tree | c1f89e0aa5f23d162cbe9078f55dc064f94fd028 | |
| parent | 8bb9660418e05bb1845ac1a2428444d78e322cc7 (diff) | |
| parent | bc8ce4afd7ee7e1421c935d24b1f879f82afdd4e (diff) | |
| download | libata-dev-7ff2b193594a358d4e91031af98211e0da6c6c87.tar.gz | |
Merge remote-tracking branch 'regmap/fix/cache' into tmp
| -rw-r--r-- | drivers/base/regmap/regcache-rbtree.c | 2 | ||||
| -rw-r--r-- | drivers/base/regmap/regmap.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/base/regmap/regcache-rbtree.c b/drivers/base/regmap/regcache-rbtree.c index e6732cf7c06eea..79f4fca9877a57 100644 --- a/drivers/base/regmap/regcache-rbtree.c +++ b/drivers/base/regmap/regcache-rbtree.c @@ -398,7 +398,7 @@ static int regcache_rbtree_sync(struct regmap *map, unsigned int min, base = 0; if (max < rbnode->base_reg + rbnode->blklen) - end = rbnode->base_reg + rbnode->blklen - max; + end = max - rbnode->base_reg + 1; else end = rbnode->blklen; diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c index 3d2367501fd052..89a920510e1dd5 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c @@ -943,8 +943,7 @@ static int _regmap_raw_write(struct regmap *map, unsigned int reg, unsigned int ival; int val_bytes = map->format.val_bytes; for (i = 0; i < val_len / val_bytes; i++) { - memcpy(map->work_buf, val + (i * val_bytes), val_bytes); - ival = map->format.parse_val(map->work_buf); + ival = map->format.parse_val(val + (i * val_bytes)); ret = regcache_write(map, reg + (i * map->reg_stride), ival); if (ret) { |