mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
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:
parent
fa2984d469
commit
eb143ac1b9
1 changed files with 2 additions and 2 deletions
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue