[PATCH] regmap: cache: Make sure to sync the last register in a block

[PATCH] regmap: cache: Make sure to sync the last register in a block

[Lars-Peter Clausen]

regcache_sync_block_raw_flush() expects the address of the register after last
register that needs to be synced as its parameter. But the last call to
regcache_sync_block_raw_flush() in regcache_sync_block_raw() passes the address
of the last register in the block. This effectively always skips over the last
register in a block, even if it needs to be synced. In order to fix it increase
the address by one register.

The issue was introduced in commit 75a5f89 ("regmap: cache: Write consecutive
registers in a single block write").

Cc: stable@vger.kernel.org # 3.10+
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
 drivers/base/regmap/regcache.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c
index e691026..3455f83 100644
--- a/drivers/base/regmap/regcache.c
+++ b/drivers/base/regmap/regcache.c
@@ -719,7 +719,8 @@ static int regcache_sync_block_raw(struct regmap *map, void *block,
 		}
 	}
 
-	return regcache_sync_block_raw_flush(map, &data, base, regtmp);
+	return regcache_sync_block_raw_flush(map, &data, base, regtmp +
+			map->reg_stride);
 }
 
 int regcache_sync_block(struct regmap *map, void *block,
-- 
1.8.0

Re: [PATCH] regmap: cache: Make sure to sync the last register in a block

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 517 bytes --]

On Mon, Aug 05, 2013 at 11:21:29AM +0200, Lars-Peter Clausen wrote:
> regcache_sync_block_raw_flush() expects the address of the register after last
> register that needs to be synced as its parameter. But the last call to
> regcache_sync_block_raw_flush() in regcache_sync_block_raw() passes the address
> of the last register in the block. This effectively always skips over the last
> register in a block, even if it needs to be synced. In order to fix it increase
> the address by one register.

Applied, thanks.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]