summaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorSangbeom Kim <sbkim73@samsung.com>2012-06-13 10:27:16 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-06-17 19:27:20 +0200
commit9d88fc0b3503e80ab1a5c9fb3b3f074302f44b33 (patch)
tree0577e89eed0cf9558b8a48cbebc56e56239054bf /drivers/regulator
parentregulator: core: Properly handle the case min_uV < rdev->desc->min_uV in map_... (diff)
downloadlinux-9d88fc0b3503e80ab1a5c9fb3b3f074302f44b33.tar.xz
linux-9d88fc0b3503e80ab1a5c9fb3b3f074302f44b33.zip
regulator: Fix the s5m8767a problem of the division by null
If ramp_delay is 0, delay value can be divided by zero. This patch can fix the problem. Signed-off-by: Sangbeom Kim <sbkim73@samsung.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/s5m8767.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/s5m8767.c b/drivers/regulator/s5m8767.c
index 290d6fc01029..9caadb482178 100644
--- a/drivers/regulator/s5m8767.c
+++ b/drivers/regulator/s5m8767.c
@@ -451,7 +451,7 @@ static int s5m8767_set_voltage_time_sel(struct regulator_dev *rdev,
desc = reg_voltage_map[reg_id];
- if (old_sel < new_sel)
+ if ((old_sel < new_sel) && s5m8767->ramp_delay)
return DIV_ROUND_UP(desc->step * (new_sel - old_sel),
s5m8767->ramp_delay * 1000);
return 0;