aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2010-08-18 11:37:21 +0800
committerLiam Girdwood <lrg@slimlogic.co.uk>2010-09-01 12:59:33 +0100
commit3e352f9e02a37c11df695aabfe49faebf507971b (patch)
treef48f179e52992dc22707171c93ef4d2b9df39929 /drivers/regulator
parentregulator: ab8500 - fix the logic to remove already registered regulators in error path (diff)
downloadlinux-dev-3e352f9e02a37c11df695aabfe49faebf507971b.tar.xz
linux-dev-3e352f9e02a37c11df695aabfe49faebf507971b.zip
regulator: max1586 - improve the logic of choosing selector
A little bit improvement in the logic of choosing selector. 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/max1586.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/regulator/max1586.c b/drivers/regulator/max1586.c
index 8867c2710a6d..559cfa271a44 100644
--- a/drivers/regulator/max1586.c
+++ b/drivers/regulator/max1586.c
@@ -121,14 +121,14 @@ static int max1586_v6_set(struct regulator_dev *rdev, int min_uV, int max_uV)
if (max_uV < MAX1586_V6_MIN_UV || max_uV > MAX1586_V6_MAX_UV)
return -EINVAL;
- if (min_uV >= 3000000)
- selector = 3;
- if (min_uV < 3000000)
- selector = 2;
- if (min_uV < 2500000)
- selector = 1;
if (min_uV < 1800000)
selector = 0;
+ else if (min_uV < 2500000)
+ selector = 1;
+ else if (min_uV < 3000000)
+ selector = 2;
+ else if (min_uV >= 3000000)
+ selector = 3;
if (max1586_v6_calc_voltage(selector) > max_uV)
return -EINVAL;