Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / drivers / regulator / max8998.c

diff --git a/drivers/regulator/max8998.c b/drivers/regulator/max8998.c
index 41a1495..27fe1c6 100644 (file)
--- a/drivers/regulator/max8998.c
+++ b/drivers/regulator/max8998.c
@@ -497,7 +497,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;
 }