summaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2012-07-13 23:01:14 +0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-08-28 11:00:15 -0700
commit13407ea802ad8ca4e830cee344e2d38dbce730f5 (patch)
tree9fb17e2280e86057f6bb8828c13d403cef3cfb7a /drivers/regulator
parentad46ed14cac14073803371f12922e7ee37e98624 (diff)
downloadlinux-13407ea802ad8ca4e830cee344e2d38dbce730f5.tar.bz2
regulator: mc13xxx: Populate selector from mc13xxx_fixed_regulator_set_voltage
This was missing until now and the underlying _regulator_do_set_voltage is using this value when calling list_voltage. Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/mc13xxx-regulator-core.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/regulator/mc13xxx-regulator-core.c b/drivers/regulator/mc13xxx-regulator-core.c
index d6eda28ca5d0..8151889745e6 100644
--- a/drivers/regulator/mc13xxx-regulator-core.c
+++ b/drivers/regulator/mc13xxx-regulator-core.c
@@ -143,10 +143,12 @@ int mc13xxx_fixed_regulator_set_voltage(struct regulator_dev *rdev, int min_uV,
__func__, id, min_uV, max_uV);
if (min_uV <= rdev->desc->volt_table[0] &&
- rdev->desc->volt_table[0] <= max_uV)
+ rdev->desc->volt_table[0] <= max_uV) {
+ *selector = 0;
return 0;
- else
+ } else {
return -EINVAL;
+ }
}
EXPORT_SYMBOL_GPL(mc13xxx_fixed_regulator_set_voltage);