OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Lars-Peter Clausen 2009-12-15 14:30:01 +01:00 committed by Liam Girdwood
parent fa2984d469
commit eb143ac1b9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/regulator/core.c
View File

@ -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;