projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6 into grant
[linux-2.6-block.git]
/
drivers
/
regulator
/
s5m8767.c
diff --git
a/drivers/regulator/s5m8767.c
b/drivers/regulator/s5m8767.c
index 290d6fc01029a92cbb4a9e7a4783d6cebaa0da02..9caadb4821786308aa624e9ef03cd7408dc2083f 100644
(file)
--- 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;