Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8f1d48b authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

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: default avatarAxel Lin <axel.lin@ingics.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 80853304

drivers/regulator/s2mps11.c

+6 −2
Original line number Diff line number Diff line
@@ -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,