]> git.karo-electronics.de Git - linux-beck.git/commitdiff
regulator: s2mps11: Don't check enable_shift before setting enable ramp rate
authorAxel Lin <axel.lin@ingics.com>
Fri, 21 Mar 2014 08:16:24 +0000 (16:16 +0800)
committerMark Brown <broonie@linaro.org>
Wed, 2 Apr 2014 19:53:16 +0000 (20:53 +0100)
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>
drivers/regulator/s2mps11.c

index 68fd54702edbf12436fbd5f7b7ebd2a6cb68e7ef..e713c162fbd41bd1e3ff7d52782a813d42e70986 100644 (file)
@@ -202,13 +202,11 @@ 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;
-               }
+       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);