Mark Brown | 28 Mar 2012 22:36
Favicon
Gravatar

[PATCH] regulator: core: Complain if we can't reenable a supply

When cleaning up after a failed bulk_disable() we try to reenable any
supplies that we did manage to disable - complain if we fail to do that
when we try.

Signed-off-by: Mark Brown <broonie <at> opensource.wolfsonmicro.com>
---
 drivers/regulator/core.c |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 957f1d1..e265632 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
 <at>  <at>  -2566,7 +2566,7  <at>  <at>  int regulator_bulk_disable(int num_consumers,
 			   struct regulator_bulk_data *consumers)
 {
 	int i;
-	int ret;
+	int ret, r;

 	for (i = num_consumers - 1; i >= 0; --i) {
 		ret = regulator_disable(consumers[i].consumer);
 <at>  <at>  -2578,8 +2578,12  <at>  <at>  int regulator_bulk_disable(int num_consumers,

 err:
 	pr_err("Failed to disable %s: %d\n", consumers[i].supply, ret);
-	for (++i; i < num_consumers; ++i)
-		(void)regulator_enable(consumers[i].consumer);
+	for (++i; i < num_consumers; ++i) {
+		r = regulator_enable(consumers[i].consumer);
+		if (r != 0)
+			pr_err("Failed to reename %s: %d\n",
+			       consumers[i].supply, r);
+	}

 	return ret;
 }
--

-- 
1.7.9.1


Gmane