From c2caa35eb012c43c7c3e61b7ab4cc742e0c9ce05 Mon Sep 17 00:00:00 2001
From: Danny Huang <dahuang@nvidia.com>
Date: Wed, 1 Dec 2010 13:37:30 -0700
Subject: [PATCH] --- yaml --- r: 223116 b: refs/heads/master c:
 1dbcf35cb5b775e564a793a338c7c3eb65fc6980 h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/regulator/tps6586x-regulator.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5312e423cbaf..c0b7c31d6a0a 100644
--- 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
index effa6770ead3..c668944dc3ad 100644
--- 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;