regmap: Ensure rbtree syncs registers set to zero properly

PATCH New Mark Brown 1 participant 1 message Oct 9, 2011

Subsystems (2)

Driver core Register map abstraction

lore

Share & tools

lore

Mark Brown

author

2011-10-09 12:09 UTC #0 lore raw

PATCH 1/1 regmap: Ensure rbtree syncs registers set to zero properly

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 <[email protected]>

---
 drivers/base/regmap/regcache-rbtree.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

drivers/base/regmap/regcache-rbtree.c +4 -5

index 40f23dd..270bd05 100644
@@ -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;

Signature · 1 line

1.7.6.3