From b2d1d0818658362b200e9d57ba685fc0a8128e62 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Wed, 18 Aug 2010 11:37:21 +0800
Subject: [PATCH] --- yaml --- r: 210718 b: refs/heads/master c:
 3e352f9e02a37c11df695aabfe49faebf507971b h: refs/heads/master v: v3

---
 [refs]                            |  2 +-
 trunk/drivers/regulator/max1586.c | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 36b952994c4c..a85a3d5029a3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4876a3bc041e8e40af20b8addbec6d0a42e3842
+refs/heads/master: 3e352f9e02a37c11df695aabfe49faebf507971b
diff --git a/trunk/drivers/regulator/max1586.c b/trunk/drivers/regulator/max1586.c
index 8867c2710a6d..559cfa271a44 100644
--- a/trunk/drivers/regulator/max1586.c
+++ b/trunk/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;