Commit cb220d16 authored by Axel Lin's avatar Axel Lin Committed by Liam Girdwood

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: default avatarAxel Lin <axel.lin@gmail.com>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent 5ccee4ae
...@@ -1886,12 +1886,14 @@ static int _regulator_get_voltage(struct regulator_dev *rdev) ...@@ -1886,12 +1886,14 @@ static int _regulator_get_voltage(struct regulator_dev *rdev)
if (sel < 0) if (sel < 0)
return sel; return sel;
ret = rdev->desc->ops->list_voltage(rdev, sel); ret = rdev->desc->ops->list_voltage(rdev, sel);
} } else if (rdev->desc->ops->get_voltage) {
if (rdev->desc->ops->get_voltage)
ret = rdev->desc->ops->get_voltage(rdev); ret = rdev->desc->ops->get_voltage(rdev);
else } else {
return -EINVAL; return -EINVAL;
}
if (ret < 0)
return ret;
return ret - rdev->constraints->uV_offset; return ret - rdev->constraints->uV_offset;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment