Commit b96244fa authored Mar 21, 2014 by Axel Lin Committed by Mark Brown Apr 02, 2014

regulator: s2mps11: Don't check enable_shift before setting enable ramp rate



Current code misses updating the register when enable_shift is 0.
e.g. S2MPS11_BUCK9_RAMP_SHIFT and S2MPS11_BUCK6_RAMP_EN_SHIFT are 0.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Mark Brown <broonie@linaro.org>

parent f7b1a8dc

drivers/regulator/s2mps11.c

+5 −7

Original line number	Diff line number	Diff line
		@@ -202,14 +202,12 @@ static int s2mps11_set_ramp_delay(struct regulator_dev *rdev, int ramp_delay)
		if (!ramp_enable)
		goto ramp_disable;

		if (enable_shift) {
		ret = regmap_update_bits(rdev->regmap, S2MPS11_REG_RAMP,
		1 << enable_shift, 1 << enable_shift);
		if (ret) {
		dev_err(&rdev->dev, "failed to enable ramp rate\n");
		return ret;
		}
		}

		ramp_val = get_ramp_delay(ramp_delay);