From 9d0c871e672eeeb31da6fc050e6061d2757d169c Mon Sep 17 00:00:00 2001 From: Donggeun Kim Date: Thu, 7 Jul 2011 16:51:56 +0900 Subject: [PATCH] --- yaml --- r: 254758 b: refs/heads/master c: 6ff325a2d85481cbe31dfbb74b4fd2d94c115300 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/regulator/max8997.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 865e3d6eaf4f..f0280d8638bb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 90609503b71b6ec4aaf325c88de98da28740bc1d +refs/heads/master: 6ff325a2d85481cbe31dfbb74b4fd2d94c115300 diff --git a/trunk/drivers/regulator/max8997.c b/trunk/drivers/regulator/max8997.c index f8940c603cf0..ad6628ca94f4 100644 --- a/trunk/drivers/regulator/max8997.c +++ b/trunk/drivers/regulator/max8997.c @@ -544,7 +544,8 @@ static int max8997_set_voltage_ldobuck(struct regulator_dev *rdev, rid == MAX8997_BUCK4 || rid == MAX8997_BUCK5) { /* If the voltage is increasing */ if (org < i) - udelay(desc->step * (i - org) / max8997->ramp_delay); + udelay(DIV_ROUND_UP(desc->step * (i - org), + max8997->ramp_delay)); } return ret;