From f8c7f51f9586d519aa0ff82de809e86390eeacc2 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Tue, 11 Dec 2012 20:36:37 +0800
Subject: [PATCH] --- yaml --- r: 343226 b: refs/heads/master c:
 8a23b4e03d6873ec50f7d212de78ff01e393fc1a h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index b8b8f11d32fa..1a232d8560b9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b17fc86cc5e8fbfd1d18765f6463d1989c59f9c6
+refs/heads/master: 8a23b4e03d6873ec50f7d212de78ff01e393fc1a
diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c
index 1c8ff8ce5c57..f3cdfe5810cc 100644
--- a/trunk/drivers/regulator/core.c
+++ b/trunk/drivers/regulator/core.c
@@ -1881,7 +1881,7 @@ int regulator_can_change_voltage(struct regulator *regulator)
 
 	if (rdev->constraints &&
 	    rdev->constraints->valid_ops_mask & REGULATOR_CHANGE_VOLTAGE &&
-	    rdev->desc->n_voltages > 1)
+	    (rdev->desc->n_voltages - rdev->desc->linear_min_sel) > 1)
 		return 1;
 
 	return 0;