lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge tag 'regmap-v3.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap

Browse Source 
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
This commit is contained in:
Linus Torvalds
2013-08-08 09:34:04 -07:00
parent 91b831a207 4f57f8ec23
commit d56290bbc1
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/base/regmap/regcache.c
View File

@@ -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,

1
include/linux/regmap.h
View File

@@ -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;