mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

regulator: core: Don't skip set_voltage_time when ramp delay disabled 

The current code assumes that only the ramp_delay is used to determine
the time needed for the voltage to stabilize. This may be true for the
calculation done by regulator_set_voltage_time_sel(), however regulators
can implement their own set_voltage_time_sel() op which would be skipped
if no ramp delay is specified. Remove the check in
_regulator_do_set_voltage(), the functions calculating the ramp delay
return 0 anyway when the ramp delay is not configured.

Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Matthias Kaehlcke 2016-09-14 09:52:07 -07:00 committed by Mark Brown
parent 31dfe686ed
commit d89564efe7
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/regulator/core.c
View File

@ -2804,9 +2804,7 @@ static int _regulator_do_set_voltage(struct regulator_dev *rdev,
goto out;
/* Call set_voltage_time_sel if successfully obtained old_selector */
if (!rdev->constraints->ramp_disable && old_selector >= 0
&& old_selector != selector) {
if (!old_selector >= 0 && old_selector != selector) {
delay = ops->set_voltage_time_sel(rdev,
old_selector, selector);
if (delay < 0) {
@ -3051,10 +3049,8 @@ int regulator_set_voltage_time_sel(struct regulator_dev *rdev,
else if (rdev->desc->ramp_delay)
ramp_delay = rdev->desc->ramp_delay;
if (ramp_delay == 0) {
rdev_warn(rdev, "ramp_delay not set\n");
if (ramp_delay == 0)
return 0;
}
/* sanity check */
if (!rdev->desc->ops->list_voltage)