diff options
| author | Axel Lin <axel.lin@ingics.com> | 2014-03-21 09:15:20 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-04-02 21:52:45 +0200 |
| commit | f7b1a8dc1c1ca30d6a9ceb1f23f0e9847668600b (patch) | |
| tree | ceee56e690112e499b6ef7977ce7afd252062d90 /drivers/regulator/s2mpa01.c | |
| parent | Merge remote-tracking branches 'regulator/topic/tps65218', 'regulator/topic/t... (diff) | |
| download | linux-f7b1a8dc1c1ca30d6a9ceb1f23f0e9847668600b.tar.xz linux-f7b1a8dc1c1ca30d6a9ceb1f23f0e9847668600b.zip | |
regulator: s2mpa01: Don't check enable_shift before setting enable ramp rate
Current code misses updating the register when enable_shift is 0.
e.g. S2MPA01_BUCK4_RAMP_EN_SHIFT is 0.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/regulator/s2mpa01.c')
| -rw-r--r-- | drivers/regulator/s2mpa01.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/regulator/s2mpa01.c b/drivers/regulator/s2mpa01.c index 808b3aa7a42c..f19a30f0fb42 100644 --- a/drivers/regulator/s2mpa01.c +++ b/drivers/regulator/s2mpa01.c @@ -192,13 +192,11 @@ static int s2mpa01_set_ramp_delay(struct regulator_dev *rdev, int ramp_delay) if (!ramp_enable) goto ramp_disable; - if (enable_shift) { - ret = regmap_update_bits(rdev->regmap, S2MPA01_REG_RAMP1, - 1 << enable_shift, 1 << enable_shift); - if (ret) { - dev_err(&rdev->dev, "failed to enable ramp rate\n"); - return ret; - } + ret = regmap_update_bits(rdev->regmap, S2MPA01_REG_RAMP1, + 1 << enable_shift, 1 << enable_shift); + if (ret) { + dev_err(&rdev->dev, "failed to enable ramp rate\n"); + return ret; } ramp_val = get_ramp_delay(ramp_delay); |