summaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2013-08-03 11:10:42 +0200
committerMark Brown <broonie@linaro.org>2013-08-13 12:17:58 +0200
commit80853304cdfb850a5e407e0e3cc8d8dc2a0b3094 (patch)
treeac159908db528dbb4ae2fd343d633a2520b9c9bb /drivers/regulator
parentregulator: s2mps11: Convert driver completely to use set_ramp_delay callback (diff)
downloadlinux-80853304cdfb850a5e407e0e3cc8d8dc2a0b3094.tar.xz
linux-80853304cdfb850a5e407e0e3cc8d8dc2a0b3094.zip
regulator: s2mps11: Fix wrong arguments for regmap_update_bits() call
Current code calls regmap_update_bits() with mask and val arguments swapped. Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/s2mps11.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c
index f047d36f6027..89140aed649f 100644
--- a/drivers/regulator/s2mps11.c
+++ b/drivers/regulator/s2mps11.c
@@ -207,8 +207,8 @@ static int s2mps11_set_ramp_delay(struct regulator_dev *rdev, int ramp_delay)
ramp_val << ramp_shift, 1 << ramp_shift);
ramp_disable:
- return regmap_update_bits(rdev->regmap, S2MPS11_REG_RAMP, 0,
- 1 << enable_shift);
+ return regmap_update_bits(rdev->regmap, S2MPS11_REG_RAMP,
+ 1 << enable_shift, 0);
}
static struct regulator_ops s2mps11_ldo_ops = {