2011-05-23 12:10:18

by Axel Lin

Subject: [PATCH v3] regulator: Fix _regulator_get_voltage if get_voltage callback is NULL

In the case of get_voltage callback is NULL, current implementation in
_regulator_get_voltage will return -EINVAL.

Also returns proper error if ret is negative value.

Signed-off-by: Axel Lin <[email protected]>
---
drivers/regulator/core.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 9493f61..d3e3879 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1886,12 +1886,14 @@ static int _regulator_get_voltage(struct regulator_dev *rdev)
if (sel < 0)
return sel;
ret = rdev->desc->ops->list_voltage(rdev, sel);
- }
- if (rdev->desc->ops->get_voltage)
+ } else if (rdev->desc->ops->get_voltage) {
ret = rdev->desc->ops->get_voltage(rdev);
- else
+ } else {
return -EINVAL;
+ }

+ if (ret < 0)
+ return ret;
return ret - rdev->constraints->uV_offset;
}

--
1.7.1

2011-05-23 14:33:33

by Mark Brown

Subject: Re: [PATCH v3] regulator: Fix _regulator_get_voltage if get_voltage callback is NULL

On Mon, May 23, 2011 at 08:08:10PM +0800, Axel Lin wrote:
> In the case of get_voltage callback is NULL, current implementation in
> _regulator_get_voltage will return -EINVAL.
>
> Also returns proper error if ret is negative value.
>
> Signed-off-by: Axel Lin <[email protected]>

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

2011-05-24 09:40:13

by Liam Girdwood

Subject: Re: [PATCH v3] regulator: Fix _regulator_get_voltage if get_voltage callback is NULL

On 23/05/11 15:33, Mark Brown wrote:
> On Mon, May 23, 2011 at 08:08:10PM +0800, Axel Lin wrote:
>> In the case of get_voltage callback is NULL, current implementation in
>> _regulator_get_voltage will return -EINVAL.
>>
>> Also returns proper error if ret is negative value.
>>
>> Signed-off-by: Axel Lin <[email protected]>
>
> Acked-by: Mark Brown <[email protected]>

Applied.

Thanks

Liam