From 69abdd99b7af2c194c8c715f56ca62af5f8ad9cf Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Thu, 7 Jun 2012 09:52:12 +0800
Subject: [PATCH] --- yaml --- r: 310651 b: refs/heads/master c:
 0bdc81e4e944781a2bcc971f9e3cf24ac7030939 h: refs/heads/master i:   310649:
 ff49130a877a30cd838872c0d8a5b2e8ceded073   310647:
 f174393c54a0b16551c79130aa79e7184d5992f8 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/regulator/core.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 45f9de0beea6..ea204373d6a7 100644
--- 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
index 7584a74eec8a..09a737c868b5 100644
--- 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;