summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-03-08 17:25:17 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-08 17:25:17 -0800
commit9a0cee711448335ec43eae83272495e9334c0098 (patch)
tree6f5cefee78019cf482220c4c0fef1f29708b32a5 /drivers
parentee0849c9114a45c1ecd6136623a25f95892c59fe (diff)
parentc4632aed3e5b134c55b54af19db49662959384c1 (diff)
downloadlinux-stable-9a0cee711448335ec43eae83272495e9334c0098.tar.gz
linux-stable-9a0cee711448335ec43eae83272495e9334c0098.tar.bz2
linux-stable-9a0cee711448335ec43eae83272495e9334c0098.zip
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator fix from Mark Brown: "Another small, clear fix in a specific driver." * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: regulator: tps65910: Configure correct value for VDDCTRL vout reg
Diffstat (limited to 'drivers')
-rw-r--r--drivers/regulator/tps65910-regulator.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/tps65910-regulator.c b/drivers/regulator/tps65910-regulator.c
index 5c15ba01e9c7..40ecf5165899 100644
--- a/drivers/regulator/tps65910-regulator.c
+++ b/drivers/regulator/tps65910-regulator.c
@@ -662,7 +662,7 @@ static int tps65910_set_voltage_dcdc(struct regulator_dev *dev,
tps65910_reg_write(pmic, TPS65910_VDD2_OP, vsel);
break;
case TPS65911_REG_VDDCTRL:
- vsel = selector;
+ vsel = selector + 3;
tps65910_reg_write(pmic, TPS65911_VDDCTRL_OP, vsel);
}