* [PATCH] regulator: regulator disable supply fix
@ 2010-11-02 12:22 Mattias Wallin
2010-11-02 13:19 ` Mark Brown
0 siblings, 1 reply; 4+ messages in thread
From: Mattias Wallin @ 2010-11-02 12:22 UTC (permalink / raw)
To: Liam Girdwood, Mark Brown; +Cc: linux-kernel, Mattias Wallin
This patch fixes a disable failure when regulator supply is used.
A while loop in regulator disable checks for supply pointer != NULL
but the pointer is not always updated, resulting in the while loop
running too many times causing a disable failure.
Signed-off-by: Mattias Wallin <mattias.wallin@stericsson.com>
---
drivers/regulator/core.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index f1d10c9..dc7d36e 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1424,6 +1424,7 @@ int regulator_disable(struct regulator *regulator)
/* decrease our supplies ref count and disable if required */
while (supply_rdev != NULL) {
rdev = supply_rdev;
+ supply_rdev = NULL;
mutex_lock(&rdev->mutex);
_regulator_disable(rdev, &supply_rdev);
--
1.6.3.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] regulator: regulator disable supply fix
2010-11-02 12:22 [PATCH] regulator: regulator disable supply fix Mattias Wallin
@ 2010-11-02 13:19 ` Mark Brown
2010-11-02 13:45 ` Mattias Wallin
0 siblings, 1 reply; 4+ messages in thread
From: Mark Brown @ 2010-11-02 13:19 UTC (permalink / raw)
To: Mattias Wallin; +Cc: Liam Girdwood, linux-kernel
On Tue, Nov 02, 2010 at 01:22:29PM +0100, Mattias Wallin wrote:
> This patch fixes a disable failure when regulator supply is used.
> A while loop in regulator disable checks for supply pointer != NULL
> but the pointer is not always updated, resulting in the while loop
> running too many times causing a disable failure.
> Signed-off-by: Mattias Wallin <mattias.wallin@stericsson.com>
Hrm. This does fix the problem which is needed so:
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> ---
> drivers/regulator/core.c | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
> index f1d10c9..dc7d36e 100644
> --- a/drivers/regulator/core.c
> +++ b/drivers/regulator/core.c
> @@ -1424,6 +1424,7 @@ int regulator_disable(struct regulator *regulator)
> /* decrease our supplies ref count and disable if required */
> while (supply_rdev != NULL) {
> rdev = supply_rdev;
> + supply_rdev = NULL;
>
> mutex_lock(&rdev->mutex);
> _regulator_disable(rdev, &supply_rdev);
but this does smell a bit like it ought to be in the _regulator_disable()
call rather than the caller.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] regulator: regulator disable supply fix
2010-11-02 13:19 ` Mark Brown
@ 2010-11-02 13:45 ` Mattias Wallin
2010-11-02 13:46 ` Mark Brown
0 siblings, 1 reply; 4+ messages in thread
From: Mattias Wallin @ 2010-11-02 13:45 UTC (permalink / raw)
To: Mark Brown; +Cc: Liam Girdwood, linux-kernel@vger.kernel.org
On 11/02/2010 02:19 PM, Mark Brown wrote:
> On Tue, Nov 02, 2010 at 01:22:29PM +0100, Mattias Wallin wrote:
>> This patch fixes a disable failure when regulator supply is used.
>> A while loop in regulator disable checks for supply pointer != NULL
>> but the pointer is not always updated, resulting in the while loop
>> running too many times causing a disable failure.
>
>> Signed-off-by: Mattias Wallin <mattias.wallin@stericsson.com>
>
> Hrm. This does fix the problem which is needed so:
>
> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
>
>> ---
>> drivers/regulator/core.c | 1 +
>> 1 files changed, 1 insertions(+), 0 deletions(-)
>>
>> diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
>> index f1d10c9..dc7d36e 100644
>> --- a/drivers/regulator/core.c
>> +++ b/drivers/regulator/core.c
>> @@ -1424,6 +1424,7 @@ int regulator_disable(struct regulator *regulator)
>> /* decrease our supplies ref count and disable if required */
>> while (supply_rdev != NULL) {
>> rdev = supply_rdev;
>> + supply_rdev = NULL;
>>
>> mutex_lock(&rdev->mutex);
>> _regulator_disable(rdev, &supply_rdev);
>
> but this does smell a bit like it ought to be in the _regulator_disable()
> call rather than the caller.
Would you prefer below solution instead?
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index dc7d36e..51f66b2 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1359,6 +1359,7 @@ static int _regulator_disable(struct regulator_dev *rdev,
struct regulator_dev **supply_rdev_ptr)
{
int ret = 0;
+ *supply_rdev_ptr = NULL;
if (WARN(rdev->use_count <= 0,
"unbalanced disables for %s\n",
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] regulator: regulator disable supply fix
2010-11-02 13:45 ` Mattias Wallin
@ 2010-11-02 13:46 ` Mark Brown
0 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2010-11-02 13:46 UTC (permalink / raw)
To: Mattias Wallin; +Cc: Liam Girdwood, linux-kernel@vger.kernel.org
On Tue, Nov 02, 2010 at 02:45:26PM +0100, Mattias Wallin wrote:
> > but this does smell a bit like it ought to be in the _regulator_disable()
> > call rather than the caller.
> Would you prefer below solution instead?
Yes.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-11-02 14:03 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-11-02 12:22 [PATCH] regulator: regulator disable supply fix Mattias Wallin
2010-11-02 13:19 ` Mark Brown
2010-11-02 13:45 ` Mattias Wallin
2010-11-02 13:46 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox