summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Lin2012-04-11 14:53:58 +0200
committerMark Brown2012-04-17 16:17:11 +0200
commitf55205f4d4a8823a11bb8b37ef2ecbd78fb09463 (patch)
treeacb5c8624f1af12cc9bb5235c5bc586b92efa832
parentLinux 3.4-rc3 (diff)
downloadkernel-qcow2-linux-f55205f4d4a8823a11bb8b37ef2ecbd78fb09463.tar.gz
kernel-qcow2-linux-f55205f4d4a8823a11bb8b37ef2ecbd78fb09463.tar.xz
kernel-qcow2-linux-f55205f4d4a8823a11bb8b37ef2ecbd78fb09463.zip
regulator: Fix the logic to ensure new voltage setting in valid range
I think this is a typo. To ensure new voltage setting won't greater than desc->max, the equation should be desc->min + desc->step * new_val <= desc->max. Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Cc: stable@vger.kernel.org
-rw-r--r--drivers/regulator/max8997.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/max8997.c b/drivers/regulator/max8997.c
index 96579296f04d..17a58c56eebf 100644
--- a/drivers/regulator/max8997.c
+++ b/drivers/regulator/max8997.c
@@ -684,7 +684,7 @@ static int max8997_set_voltage_buck(struct regulator_dev *rdev,
}
new_val++;
- } while (desc->min + desc->step + new_val <= desc->max);
+ } while (desc->min + desc->step * new_val <= desc->max);
new_idx = tmp_idx;
new_val = tmp_val;