[PATCH] regmap: Ensure rbtree syncs registers set to zero properly

From: Mark Brown
Date: Sun Oct 09 2011 - 08:09:35 EST


Simplify the check for registers set at their default value by avoiding
picking a default value in the case where we don't have one. Instead we
only compare the current value to the current value when we looked one
up. This fixes the case where we don't have a default stored but the value
was set to zero when that isn't the chip default.

Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
---
drivers/base/regmap/regcache-rbtree.c | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/base/regmap/regcache-rbtree.c b/drivers/base/regmap/regcache-rbtree.c
index 40f23dd..270bd05 100644
--- a/drivers/base/regmap/regcache-rbtree.c
+++ b/drivers/base/regmap/regcache-rbtree.c
@@ -319,13 +319,12 @@ static int regcache_rbtree_sync(struct regmap *map)
regtmp = rbnode->base_reg + i;
val = regcache_rbtree_get_register(rbnode, i,
map->cache_word_size);
+
+ /* Is this the hardware default? If so skip. */
ret = regcache_lookup_reg(map, i);
- if (ret < 0)
- def = 0;
- else
- def = map->reg_defaults[ret].def;
- if (val == def)
+ if (ret > 0 && val == map->reg_defaults[ret].def)
continue;
+
map->cache_bypass = 1;
ret = _regmap_write(map, regtmp, val);
map->cache_bypass = 0;
--
1.7.6.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/