[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1260883801-22667-1-git-send-email-lars@metafoo.de>
Date: Tue, 15 Dec 2009 14:30:01 +0100
From: Lars-Peter Clausen <lars@...afoo.de>
To: lrg@...mlogic.co.uk
Cc: linux-kernel@...r.kernel.org, Lars-Peter Clausen <lars@...afoo.de>
Subject: [PATCH] regulator: Fix unbalanced disables/enables in regulator_bulk_{enable,disable} error path
Currently it is possible for regulator_bulk_{enable,disable} operations to
generate unbalanced regulator_{disable,enable} calls in its error path.
In case of an error only those regulators of the bulk operation which actually
had been enabled/disabled should get their original state restored.
Signed-off-by: Lars-Peter Clausen <lars@...afoo.de>
---
drivers/regulator/core.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 1af8df2..686ef27 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1977,7 +1977,7 @@ int regulator_bulk_enable(int num_consumers,
err:
printk(KERN_ERR "Failed to enable %s: %d\n", consumers[i].supply, ret);
- for (i = 0; i < num_consumers; i++)
+ for (--i; i >= 0; --i)
regulator_disable(consumers[i].consumer);
return ret;
@@ -2013,7 +2013,7 @@ int regulator_bulk_disable(int num_consumers,
err:
printk(KERN_ERR "Failed to disable %s: %d\n", consumers[i].supply,
ret);
- for (i = 0; i < num_consumers; i++)
+ for (--i; i >= 0; --i)
regulator_enable(consumers[i].consumer);
return ret;
--
1.5.6.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists