Commit 3ff8f932 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 4a1e8ebc 4b4e9e43
...@@ -396,7 +396,7 @@ static int regcache_rbtree_sync(struct regmap *map, unsigned int min, ...@@ -396,7 +396,7 @@ static int regcache_rbtree_sync(struct regmap *map, unsigned int min,
map->cache_word_size); map->cache_word_size);
/* Is this the hardware default? If so skip. */ /* 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) if (ret >= 0 && val == map->reg_defaults[ret].def)
continue; continue;
......
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