From c37ba8e413d20a34cf2cf98f558e36ed32ac784d Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Mon, 20 Feb 2012 10:32:16 +0800
Subject: [PATCH] --- yaml --- r: 292003 b: refs/heads/master c:
 b29c7690a764b9829b1034f873f97b7bbfa19565 h: refs/heads/master i:   292001:
 3eb9174629c97d0e0e3a1d3059723947fbb59dbd   291999:
 491d8145c4fac15294202ba51e7f7be2cdf224f9 v: v3

---
 [refs]                         |  2 +-
 trunk/drivers/regulator/core.c | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index d4c2324e4e90..088edd420e13 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fde297bb4d8075229b8985e9d4f96d32339a8e68
+refs/heads/master: b29c7690a764b9829b1034f873f97b7bbfa19565
diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c
index 9a143aebb84b..6c845200a530 100644
--- a/trunk/drivers/regulator/core.c
+++ b/trunk/drivers/regulator/core.c
@@ -2397,7 +2397,7 @@ int regulator_bulk_get(struct device *dev, int num_consumers,
 	return 0;
 
 err:
-	for (i = 0; i < num_consumers && consumers[i].consumer; i++)
+	while (--i >= 0)
 		regulator_put(consumers[i].consumer);
 
 	return ret;
@@ -2447,12 +2447,9 @@ int regulator_bulk_enable(int num_consumers,
 	return 0;
 
 err:
-	for (i = 0; i < num_consumers; i++)
-		if (consumers[i].ret == 0)
-			regulator_disable(consumers[i].consumer);
-		else
-			pr_err("Failed to enable %s: %d\n",
-			       consumers[i].supply, consumers[i].ret);
+	pr_err("Failed to enable %s: %d\n", consumers[i].supply, ret);
+	while (--i >= 0)
+		regulator_disable(consumers[i].consumer);
 
 	return ret;
 }