Skip to content

Commit

Permalink
regulator: s2mps11: Fix setting ramp_delay
Browse files Browse the repository at this point in the history
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>
Signed-off-by: Mark Brown <broonie@linaro.org>
  • Loading branch information
Axel Lin authored and Mark Brown committed Aug 13, 2013
1 parent 8085330 commit f8f1d48
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions drivers/regulator/s2mps11.c
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@ static int get_ramp_delay(int ramp_delay)
break;
cnt++;
}

if (cnt > 3)
cnt = 3;

return cnt;
}

Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit f8f1d48

Please sign in to comment.