diff options
| author | Axel Lin <axel.lin@ingics.com> | 2013-08-05 08:08:37 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-13 12:17:58 +0200 |
| commit | f8f1d48be393f517a16de4271cc8b7854efd693a (patch) | |
| tree | c543e476d136f8b35eefd06806db50170840654e /drivers/regulator | |
| parent | regulator: s2mps11: Fix wrong arguments for regmap_update_bits() call (diff) | |
| download | linux-f8f1d48be393f517a16de4271cc8b7854efd693a.tar.xz linux-f8f1d48be393f517a16de4271cc8b7854efd693a.zip | |
regulator: s2mps11: Fix setting ramp_delay
Current code has wrong mask and val arguments for updating ramp_delay. Fix it.
Also ensure the return value of get_ramp_delay() won't greater than 3 because
the mask field for ramp_val only takes 2 bits.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/s2mps11.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c index 89140aed649f..5eba2ff8c0e8 100644 --- a/drivers/regulator/s2mps11.c +++ b/drivers/regulator/s2mps11.c @@ -50,6 +50,10 @@ static int get_ramp_delay(int ramp_delay) break; cnt++; } + + if (cnt > 3) + cnt = 3; + return cnt; } @@ -203,8 +207,8 @@ static int s2mps11_set_ramp_delay(struct regulator_dev *rdev, int ramp_delay) ramp_val = get_ramp_delay(ramp_delay); - return regmap_update_bits(rdev->regmap, ramp_reg, - ramp_val << ramp_shift, 1 << ramp_shift); + return regmap_update_bits(rdev->regmap, ramp_reg, 0x3 << ramp_shift, + ramp_val << ramp_shift); ramp_disable: return regmap_update_bits(rdev->regmap, S2MPS11_REG_RAMP, |