leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

regulator: max8973: Fix setting ramp delay

Browse Source 
Current code can set ramp delay to a wrong setting that the return value
from .set_voltage_time_sel is not enough for proper delay.
Fix the logic in .set_ramp_delay and also remove unused ret_val variable.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Axel Lin 2016-05-29 19:20:03 +08:00 committed by Mark Brown
parent 1a695a905c
commit d0abd6f5f5
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/regulator/max8973-regulator.c
View File

@ -271,22 +271,18 @@ static int max8973_set_ramp_delay(struct regulator_dev *rdev,
struct max8973_chip *max = rdev_get_drvdata(rdev); struct max8973_chip *max = rdev_get_drvdata(rdev);
unsigned int control; unsigned int control;
int ret; int ret;
int ret_val;
/* Set ramp delay */ /* Set ramp delay */
if (ramp_delay < 25000) { if (ramp_delay <= 12000)
control = MAX8973_RAMP_12mV_PER_US; control = MAX8973_RAMP_12mV_PER_US;
ret_val = 12000; else if (ramp_delay <= 25000)
} else if (ramp_delay < 50000) {
control = MAX8973_RAMP_25mV_PER_US; control = MAX8973_RAMP_25mV_PER_US;
ret_val = 25000; else if (ramp_delay <= 50000)
} else if (ramp_delay < 200000) {
control = MAX8973_RAMP_50mV_PER_US; control = MAX8973_RAMP_50mV_PER_US;
ret_val = 50000; else if (ramp_delay <= 200000)
} else {
control = MAX8973_RAMP_200mV_PER_US; control = MAX8973_RAMP_200mV_PER_US;
ret_val = 200000; else
} return -EINVAL;
ret = regmap_update_bits(max->regmap, MAX8973_CONTROL1, ret = regmap_update_bits(max->regmap, MAX8973_CONTROL1,
MAX8973_RAMP_MASK, control); MAX8973_RAMP_MASK, control);