aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2013-01-09 19:34:57 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-06-07 16:02:07 -0700
commitaf857f1c3e407fd2650665f5e5c92f70994905fa (patch)
tree7b59a7354de7ac4087116ec22582d5e0be061e3d /drivers
parentcd858528541c10bb879436da8fce44e0c9c85b97 (diff)
regulator: max8998: Ensure enough delay time for max8998_set_voltage_buck_time_sel
commit e8d9897ff064b1683c11c15ea1296a67a45d77b0 upstream. commit 81d0a6ae7befb24c06f4aa4856af7f8d1f612171 upstream. Use DIV_ROUND_UP to prevent truncation by integer division issue. This ensures we return enough delay time. Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> [bwh: Backported to 3.2: delay is done by driver, not returned to the caller] Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Cc: Qiang Huang <h.huangqiang@huawei.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/regulator/max8998.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/max8998.c b/drivers/regulator/max8998.c
index 5890265eeac..130038368b7 100644
--- a/drivers/regulator/max8998.c
+++ b/drivers/regulator/max8998.c
@@ -492,7 +492,7 @@ buck2_exit:
difference = desc->min + desc->step*i - previous_vol/1000;
if (difference > 0)
- udelay(difference / ((val & 0x0f) + 1));
+ udelay(DIV_ROUND_UP(difference, (val & 0x0f) + 1));
return ret;
}