From f6da19a12611cb966651b9e85be7fea015269190 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Thu, 7 Jun 2012 10:05:14 +0800
Subject: [PATCH] --- yaml --- r: 312516 b: refs/heads/master c:
 5a6881e8e134ea636bbc8423049e84638dbb7106 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 5186485b908d..e69919bf8a5c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 93b07e7bcd50bb73d3d60043438fa68bd5a0988b
+refs/heads/master: 5a6881e8e134ea636bbc8423049e84638dbb7106
diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c
index 8521e0d6b3bc..5c6aedaa934d 100644
--- a/trunk/drivers/regulator/core.c
+++ b/trunk/drivers/regulator/core.c
@@ -2070,6 +2070,14 @@ int regulator_map_voltage_linear(struct regulator_dev *rdev,
 {
 	int ret, voltage;
 
+	/* Allow uV_step to be 0 for fixed voltage */
+	if (rdev->desc->n_voltages == 1 && rdev->desc->uV_step == 0) {
+		if (min_uV <= rdev->desc->min_uV && rdev->desc->min_uV <= max_uV)
+			return 0;
+		else
+			return -EINVAL;
+	}
+
 	if (!rdev->desc->uV_step) {
 		BUG_ON(!rdev->desc->uV_step);
 		return -EINVAL;