aboutsummaryrefslogtreecommitdiff
path: root/drivers/regulator/s5m8767.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-06-25 10:11:40 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-06-25 10:11:40 +0100
commit85e63343f49cdf859bb630ba39d9a9af85dfb3e6 (patch)
tree8c72184c38d93a34e08f386ae70b4ee12ed7ac20 /drivers/regulator/s5m8767.c
parent2f6ae6ef631cd16b0725958ee805a24b9e38d7ad (diff)
parent6b16351acbd415e66ba16bf7d473ece1574cf0bc (diff)
downloadlinaro-lsk-85e63343f49cdf859bb630ba39d9a9af85dfb3e6.tar.gz
Merge tag 'v3.5-rc4' into regulator-drivers
Linux 3.5-rc4 contains patches which conflict with some of the development work.
Diffstat (limited to 'drivers/regulator/s5m8767.c')
-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 fd89574c405..22642c3ccf7 100644
--- a/drivers/regulator/s5m8767.c
+++ b/drivers/regulator/s5m8767.c
@@ -442,7 +442,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;