Skip to contentSkip to conversation

regulator: s2mps11: Fix setting ramp_delay

PATCH Applied Axel Lin 2 participants 2 messages Aug 5, 2013 – Aug 13, 2013

Subsystems (2)
Voltage and current regulator framework Samsung multifunction PMIC device drivers
lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 drivers/regulator/s2mps11.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/regulator/s2mps11.c +6 -2
index 89140ae..5eba2ff 100644
@@ -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,
Signature · 1 line
1.8.1.2
maintainer Applied
#1 lore raw
Quoted 3 lines · 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.

Applied, thanks.