2009-12-15 13:30:27

by Lars-Peter Clausen

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 <[email protected]>
---
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

2009-12-15 13:41:13

by Mark Brown

Subject: Re: [PATCH] regulator: Fix unbalanced disables/enables in regulator_bulk_{enable,disable} error path

On Tue, Dec 15, 2009 at 02:30:01PM +0100, Lars-Peter Clausen wrote:
> 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 <[email protected]>

Acked-by: Mark Brown <[email protected]>

2009-12-15 14:39:27

by Liam Girdwood

Subject: Re: [PATCH] regulator: Fix unbalanced disables/enables in regulator_bulk_{enable,disable} error path

On Tue, 2009-12-15 at 14:30 +0100, Lars-Peter Clausen wrote:
> 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 <[email protected]>
> ---
> drivers/regulator/core.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>

Applied for 2.6.33.

Thanks

Liam