diff options
author | Axel Lin <axel.lin@ingics.com> | 2014-03-21 04:15:20 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-04-02 15:52:45 -0400 |
commit | f7b1a8dc1c1ca30d6a9ceb1f23f0e9847668600b (patch) | |
tree | ceee56e690112e499b6ef7977ce7afd252062d90 /drivers/regulator | |
parent | 5481b348e80fb280ff9eaa17ad99a5b592c7e145 (diff) |
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')
-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) | |||
192 | if (!ramp_enable) | 192 | if (!ramp_enable) |
193 | goto ramp_disable; | 193 | goto ramp_disable; |
194 | 194 | ||
195 | if (enable_shift) { | 195 | ret = regmap_update_bits(rdev->regmap, S2MPA01_REG_RAMP1, |
196 | ret = regmap_update_bits(rdev->regmap, S2MPA01_REG_RAMP1, | 196 | 1 << enable_shift, 1 << enable_shift); |
197 | 1 << enable_shift, 1 << enable_shift); | 197 | if (ret) { |
198 | if (ret) { | 198 | dev_err(&rdev->dev, "failed to enable ramp rate\n"); |
199 | dev_err(&rdev->dev, "failed to enable ramp rate\n"); | 199 | return ret; |
200 | return ret; | ||
201 | } | ||
202 | } | 200 | } |
203 | 201 | ||
204 | ramp_val = get_ramp_delay(ramp_delay); | 202 | ramp_val = get_ramp_delay(ramp_delay); |