---

yaml --- r: 302188 b: refs/heads/master c: 2358b77 h: refs/heads/master v: v3
git-mirror · Apr 10, 2012 · b132363 · b132363
1 parent a45053f
commit b132363
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git 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
@@ -415,17 +415,18 @@ 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;
 
 	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;