diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-18 17:37:37 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-18 17:37:37 -0400 |
| commit | 63236f4038f7e14762114606d95769c32cf6cac1 (patch) | |
| tree | 326303a0880c46ddadfc29d3bacad073ed1cef20 /drivers/regulator/ad5398.c | |
| parent | 16fbcc3b1139e90fe560fde5619169db74dc02c2 (diff) | |
| parent | ca61a7bfcd1c68eba84a58070540684448216506 (diff) | |
Merge remote-tracking branch 'regulator/topic/drivers' into regulator-next
Diffstat (limited to 'drivers/regulator/ad5398.c')
| -rw-r--r-- | drivers/regulator/ad5398.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/regulator/ad5398.c b/drivers/regulator/ad5398.c index 483c80930852..26d23adfc66f 100644 --- a/drivers/regulator/ad5398.c +++ b/drivers/regulator/ad5398.c | |||
| @@ -94,8 +94,8 @@ static int ad5398_set_current_limit(struct regulator_dev *rdev, int min_uA, int | |||
| 94 | if (max_uA > chip->max_uA || max_uA < chip->min_uA) | 94 | if (max_uA > chip->max_uA || max_uA < chip->min_uA) |
| 95 | return -EINVAL; | 95 | return -EINVAL; |
| 96 | 96 | ||
| 97 | selector = ((min_uA - chip->min_uA) * chip->current_level + | 97 | selector = DIV_ROUND_UP((min_uA - chip->min_uA) * chip->current_level, |
| 98 | range_uA - 1) / range_uA; | 98 | range_uA); |
| 99 | if (ad5398_calc_current(chip, selector) > max_uA) | 99 | if (ad5398_calc_current(chip, selector) > max_uA) |
| 100 | return -EINVAL; | 100 | return -EINVAL; |
| 101 | 101 | ||