diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-08 16:34:04 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-08 16:34:04 (GMT) |
| commit | d56290bbc1ad0cf56b25f7cb5859305a486b1bbc (patch) | |
| tree | 49bfc1026a791ccdb24281478e5fe638f381939e /drivers | |
| parent | 91b831a20709922563a2280ff9a9000fe41fbcb4 (diff) | |
| parent | 4f57f8ec238db29c5dd4ce42a6c0fbb2956a6645 (diff) | |
| download | linux-d56290bbc1ad0cf56b25f7cb5859305a486b1bbc.tar.xz | |
Merge tag 'regmap-v3.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap
Pull regmap fixes from Mark Brown:
"Two things here, one is a fix for a nasty issue where we were failing
to sync the last register in a block when using raw writes and the
other fixes a missing header for the !REGMAP stubs so that we don't
rely on implicit includes in that case"
* tag 'regmap-v3.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
regmap: Add missing header for !CONFIG_REGMAP stubs
regmap: cache: Make sure to sync the last register in a block
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/base/regmap/regcache.c | 3 |
1 files changed, 2 insertions, 1 deletions
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, |