aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/regulator/core.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2012-12-11 20:36:37 +0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-11 21:44:23 +0900
commit8a23b4e03d6873ec50f7d212de78ff01e393fc1a (patch)
tree4cedde456bb56b1745eebdc2ebfa68b39cc1c998 /drivers/regulator/core.c
parentMerge branch 'topic/min' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-change (diff)
downloadlinux-dev-8a23b4e03d6873ec50f7d212de78ff01e393fc1a.tar.xz
linux-dev-8a23b4e03d6873ec50f7d212de78ff01e393fc1a.zip
regulator: core: Fix logic to determinate if regulator can change voltage
Having a linear_min_sel setting means the first linear_min_sel selectors are invalid. We need to subtract linear_min_sel when use n_voltages to determinate if regulator can change voltage. Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator/core.c')
-rw-r--r--drivers/regulator/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 1c8ff8ce5c57..f3cdfe5810cc 100644
--- a/drivers/regulator/core.c
+++ b/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;