Commit d56290bb authored by Linus Torvalds's avatar Linus Torvalds

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
parents 91b831a2 4f57f8ec
...@@ -719,7 +719,8 @@ static int regcache_sync_block_raw(struct regmap *map, void *block, ...@@ -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, int regcache_sync_block(struct regmap *map, void *block,
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include <linux/list.h> #include <linux/list.h>
#include <linux/rbtree.h> #include <linux/rbtree.h>
#include <linux/err.h>
struct module; struct module;
struct device; struct device;
......
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