diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-04 19:10:14 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-04 19:10:14 +0200 |
| commit | 3ff8f932bce11fc89e435acb30263a06cb8bd084 (patch) | |
| tree | 690ae19fd4f6f24da48cedf926f56a3996dfc68a | |
| parent | Merge tag 'regulator-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/br... (diff) | |
| parent | regmap: rbtree: Fix register default look-up in sync (diff) | |
| download | linux-3ff8f932bce11fc89e435acb30263a06cb8bd084.tar.xz linux-3ff8f932bce11fc89e435acb30263a06cb8bd084.zip | |
Merge tag 'regmap-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap
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
| -rw-r--r-- | drivers/base/regmap/regcache-rbtree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/regmap/regcache-rbtree.c b/drivers/base/regmap/regcache-rbtree.c index 5157fa04c2f0..fb14a6343d4f 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; |