diff options
| author |   Axel Lin <axel.lin@ingics.com> | 2016-05-29 19:20:03 +0800 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2016-05-30 17:00:56 +0100 |
| commit | d0abd6f5f5eac758f4bcf4001f6cc377320ebc84 (patch) | |
| tree | 9afcc4230513211415ad3c985cd43c1881fd10a1 /drivers/regulator/max8973-regulator.c | |
| parent | Linux 4.7-rc1 (diff) | |
| download | wireguard-linux-d0abd6f5f5eac758f4bcf4001f6cc377320ebc84.tar.xz wireguard-linux-d0abd6f5f5eac758f4bcf4001f6cc377320ebc84.zip | |
regulator: max8973: Fix setting ramp delay
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>
Diffstat (limited to 'drivers/regulator/max8973-regulator.c')
| -rw-r--r-- | drivers/regulator/max8973-regulator.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/drivers/regulator/max8973-regulator.c b/drivers/regulator/max8973-regulator.c index 08d2f13eca00..3958f50c5975 100644 --- a/drivers/regulator/max8973-regulator.c +++ b/drivers/regulator/max8973-regulator.c @@ -271,22 +271,18 @@ static int max8973_set_ramp_delay(struct regulator_dev *rdev, struct max8973_chip *max = rdev_get_drvdata(rdev); unsigned int control; int ret; - int ret_val; /* Set ramp delay */ - if (ramp_delay < 25000) { + if (ramp_delay <= 12000) control = MAX8973_RAMP_12mV_PER_US; - ret_val = 12000; - } else if (ramp_delay < 50000) { + else if (ramp_delay <= 25000) control = MAX8973_RAMP_25mV_PER_US; - ret_val = 25000; - } else if (ramp_delay < 200000) { + else if (ramp_delay <= 50000) control = MAX8973_RAMP_50mV_PER_US; - ret_val = 50000; - } else { + else if (ramp_delay <= 200000) control = MAX8973_RAMP_200mV_PER_US; - ret_val = 200000; - } + else + return -EINVAL; ret = regmap_update_bits(max->regmap, MAX8973_CONTROL1, MAX8973_RAMP_MASK, control); |