aboutsummaryrefslogtreecommitdiff
path: root/drivers/regulator/tps65023-regulator.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2012-02-06 21:01:14 +0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-02-06 16:38:18 +0000
commit0c3d0b20cf9cee1023b1a2e27cfd79db95b578b5 (patch)
tree89f1f959f32982eaef0c25818b61b0334900de4e /drivers/regulator/tps65023-regulator.c
parent20a14b84f8d62ba9ad7acad1d67a2ffa3c06468b (diff)
downloadlinaro-lsk-0c3d0b20cf9cee1023b1a2e27cfd79db95b578b5.tar.gz
regulator: Remove redundant regmap_update_bits call for TPS65023_REG_CON_CTRL2
This looks like a merge mistake. Calling regmap_update_bits once is enough. Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator/tps65023-regulator.c')
-rw-r--r--drivers/regulator/tps65023-regulator.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/regulator/tps65023-regulator.c b/drivers/regulator/tps65023-regulator.c
index 18d61a0529a..43e4902d7af 100644
--- a/drivers/regulator/tps65023-regulator.c
+++ b/drivers/regulator/tps65023-regulator.c
@@ -491,10 +491,6 @@ static int __devinit tps_65023_probe(struct i2c_client *client,
regmap_update_bits(tps->regmap, TPS65023_REG_CON_CTRL2,
TPS65023_REG_CTRL2_CORE_ADJ, TPS65023_REG_CTRL2_CORE_ADJ);
- /* Enable setting output voltage by I2C */
- regmap_update_bits(tps->regmap, TPS65023_REG_CON_CTRL2,
- TPS65023_REG_CTRL2_CORE_ADJ, TPS65023_REG_CTRL2_CORE_ADJ);
-
return 0;
fail: