summaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2011-05-23 20:08:10 +0800
committerLiam Girdwood <lrg@slimlogic.co.uk>2011-05-27 10:49:30 +0100
commitcb220d16f91f8d5fa1450c7af17e028e8cb3f0f1 (patch)
tree98af3e7e811980be3608c1c4b7506fb73d74d21c /drivers/regulator
parent5ccee4ae8eab957ab6d534283db5bd27703dba03 (diff)
downloadlinux-cb220d16f91f8d5fa1450c7af17e028e8cb3f0f1.tar.bz2
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 <axel.lin@gmail.com> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/core.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 9493f6111a38..d3e38790906e 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;
}