diff --git a/[refs] b/[refs]
index 1f7a49dfdc43..9bd42958cfc1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0fa310ccabfe9034017e1b6780052d36fbd9f38f
+refs/heads/master: 2358b7763ee6673c0d08ddf9dcfe96e982e9b26f
diff --git a/trunk/drivers/regulator/max8997.c b/trunk/drivers/regulator/max8997.c
index 89c93d891140..db09244bb3ed 100644
--- a/trunk/drivers/regulator/max8997.c
+++ b/trunk/drivers/regulator/max8997.c
@@ -415,7 +415,7 @@ static inline int max8997_get_voltage_proper_val(
 		const struct voltage_map_desc *desc,
 		int min_vol, int max_vol)
 {
-	int i = 0;
+	int i;
 
 	if (desc == NULL)
 		return -EINVAL;
@@ -423,9 +423,10 @@ static inline int max8997_get_voltage_proper_val(
 	if (max_vol < desc->min || min_vol > desc->max)
 		return -EINVAL;
 
-	while (desc->min + desc->step * i < min_vol &&
-			desc->min + desc->step * i < desc->max)
-		i++;
+	if (min_vol < desc->min)
+		min_vol = desc->min;
+
+	i = DIV_ROUND_UP(min_vol - desc->min, desc->step);
 
 	if (desc->min + desc->step * i > max_vol)
 		return -EINVAL;