---

yaml --- r: 223116 b: refs/heads/master c: 1dbcf35 h: refs/heads/master v: v3
git-mirror · Dec 9, 2010 · c2caa35 · c2caa35
1 parent 64a1037
commit c2caa35
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 64db657b5a45f1676d421e2bdfb7d4910dce87d3
+refs/heads/master: 1dbcf35cb5b775e564a793a338c7c3eb65fc6980
diff --git a/trunk/drivers/regulator/tps6586x-regulator.c b/trunk/drivers/regulator/tps6586x-regulator.c
@@ -297,6 +297,10 @@ static inline int tps6586x_regulator_preinit(struct device *parent,
 	uint8_t val1, val2;
 	int ret;
 
+	if (ri->enable_reg[0] == ri->enable_reg[1] &&
+	    ri->enable_bit[0] == ri->enable_bit[1])
+			return 0;
+
 	ret = tps6586x_read(parent, ri->enable_reg[0], &val1);
 	if (ret)
 		return ret;