summaryrefslogtreecommitdiff
path: root/drivers/regulator
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2012-04-11 20:53:58 +0800
committerBen Hutchings <ben@decadent.org.uk>2012-05-20 22:56:29 +0100
commit42d66f95429ec18ea8d505fc1b90a32aa7d894e4 (patch)
tree00b07b06cc18645640f22c1abcae8d7ff51a96a8 /drivers/regulator
parenta2cfa87491c4ef47de3c4e0973ebb457019a3963 (diff)
regulator: Fix the logic to ensure new voltage setting in valid range
commit f55205f4d4a8823a11bb8b37ef2ecbd78fb09463 upstream. 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> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/regulator')
-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 6176129a27e5..8cba82d3cadc 100644
--- a/drivers/regulator/max8997.c
+++ b/drivers/regulator/max8997.c
@@ -689,7 +689,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;