diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2009-12-15 14:30:01 +0100 |
|---|---|---|
| committer | Liam Girdwood <lrg@slimlogic.co.uk> | 2009-12-17 10:27:28 +0000 |
| commit | eb143ac1b9f56ca9c6dc782d795acda1f60c5fd2 (patch) | |
| tree | 33a56cd82ee52eb613c9fb81bbcf8f15586e7f49 /drivers | |
| parent | fa2984d4691c96367d6666694ecc6744135174c6 (diff) | |
| download | linux-3.10-eb143ac1b9f56ca9c6dc782d795acda1f60c5fd2.tar.gz linux-3.10-eb143ac1b9f56ca9c6dc782d795acda1f60c5fd2.tar.bz2 linux-3.10-eb143ac1b9f56ca9c6dc782d795acda1f60c5fd2.zip | |
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@metafoo.de>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'drivers')
| -rw-r--r-- | 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 1af8df203b7..686ef270ecf 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; |