---

yaml --- r: 267015 b: refs/heads/master c: b03622a h: refs/heads/master i: 267013: 145dc5f 267011: 792c5b2 267007: 0a25e4a v: v3
git-mirror · Oct 10, 2011 · eebdf46 · eebdf46
1 parent 8810ef9
commit eebdf46
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e42c5a9a4230c38ceba0a890b30a2d0dd9314bff
+refs/heads/master: b03622a80d2206c4179d6a41a0dc5cfbdfc853ee
diff --git a/trunk/drivers/base/regmap/regcache-rbtree.c b/trunk/drivers/base/regmap/regcache-rbtree.c
@@ -304,7 +304,7 @@ static int regcache_rbtree_sync(struct regmap *map)
 	struct rb_node *node;
 	struct regcache_rbtree_node *rbnode;
 	unsigned int regtmp;
-	unsigned int val, def;
+	unsigned int val;
 	int ret;
 	int i;
 
@@ -315,13 +315,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;