---

yaml --- r: 310651 b: refs/heads/master c: 0bdc81e h: refs/heads/master i: 310649: ff49130 310647: f174393 v: v3
git-mirror · Jun 7, 2012 · 69abdd9 · 69abdd9
1 parent 9a70bc1
commit 69abdd9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 61663171bea0ccb499f0818234c5be7ea6c4c791
+refs/heads/master: 0bdc81e4e944781a2bcc971f9e3cf24ac7030939
diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c
@@ -2050,6 +2050,9 @@ int regulator_map_voltage_linear(struct regulator_dev *rdev,
 		return -EINVAL;
 	}
 
+	if (min_uV < rdev->desc->min_uV)
+		min_uV = rdev->desc->min_uV;
+
 	ret = DIV_ROUND_UP(min_uV - rdev->desc->min_uV, rdev->desc->uV_step);
 	if (ret < 0)
 		return ret;