Merge remote-tracking branch 'regulator/fix/core' into tmp

5fb910d3 · Mark Brown · 6dbe51c2 · fbe31057 · 5fb910d3
Commit 5fb910d3 authored Mar 05, 2013 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

drivers/regulator/core.c drivers/regulator/core.c +7 -3

No files found.
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -3057,9 +3057,13 @@ int regulator_bulk_enable(int num_consumers,
 	return 0;
 err:
-	pr_err("Failed to enable %s: %d\n", consumers[i].supply, ret);
+	for (i = 0; i < num_consumers; i++) {
-	while (--i >= 0)
+		if (consumers[i].ret < 0)
-		regulator_disable(consumers[i].consumer);
+			pr_err("Failed to enable %s: %d\n", consumers[i].supply,
+			       consumers[i].ret);
+		else
+			regulator_disable(consumers[i].consumer);
+	}
 	return ret;
 }