[PATCH] regulator: s2mps11: Fix setting ramp_delay

[PATCH] regulator: s2mps11: Fix setting ramp_delay

[Axel Lin]

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>
---
 drivers/regulator/s2mps11.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c
index 89140ae..5eba2ff 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,
-- 
1.8.1.2

Re: [PATCH] regulator: s2mps11: Fix setting ramp_delay

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 286 bytes --]

On Mon, Aug 05, 2013 at 02:08:37PM +0800, Axel Lin wrote:
> 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.

Applied, thanks.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]