projects/linux·commit 3ff8f932

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

3ff8f932 · Linus Torvalds <[email protected]> · 2012-04-04 10:10:14 -07:00

Pull a single regmap fix from Mark Brown:
 "A simple bug that's been lurking for a while but not terribly visible
  since a high proportion of chips have no register 0 so the normal
  failure is that we end up doing a bit of extra I/O."

* tag 'regmap-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
  regmap: rbtree: Fix register default look-up in sync
Commit
3ff8f932bce11fc89e435acb30263a06cb8bd084
Parents
4a1e8ebc · 4b4e9e43

Merge commit. Changes below are compared with the first parent: 4a1e8ebc.

Changes

1 files changed · +1 −1

FileStatusAddDelContent
drivers/base/regmap/regcache-rbtree.cmodified+1−1View file

drivers/base/regmap/regcache-rbtree.c

View file
diff --git a/drivers/base/regmap/regcache-rbtree.c b/drivers/base/regmap/regcache-rbtree.c
index 5157fa0..fb14a63 100644
--- a/drivers/base/regmap/regcache-rbtree.c
+++ b/drivers/base/regmap/regcache-rbtree.c
@@ -396,7 +396,7 @@ static int regcache_rbtree_sync(struct regmap *map, unsigned int min,
map->cache_word_size);
/* Is this the hardware default? If so skip. */
- ret = regcache_lookup_reg(map, i);
+ ret = regcache_lookup_reg(map, regtmp);
if (ret >= 0 && val == map->reg_defaults[ret].def)
continue;