summaryrefslogtreecommitdiff
path: root/drivers/regulator
diff options
context:
space:
mode:
authorJuha Keski-Saari <ext-juha.1.keski-saari@nokia.com>2009-12-16 15:28:00 +0200
committerLiam Girdwood <lrg@slimlogic.co.uk>2009-12-17 10:27:29 +0000
commitcf9836f4ddd1a08e88fe05e06f21313c609d3d55 (patch)
tree5e96cde2859b5a203dd4c5165b28d6f1b07486c2 /drivers/regulator
parent53b8a9d92a713fa82316bf418dcc19d6da32ca05 (diff)
twl-regulator: Fix reg_disable functionality for 4030 and 6030
This change makes sure all regulator group assignments are cleared on disable call Signed-off-by: Juha Keski-Saari <ext-juha.1.keski-saari@nokia.com> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/twl-regulator.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/regulator/twl-regulator.c b/drivers/regulator/twl-regulator.c
index 9bcea4d131be..7e674859bd59 100644
--- a/drivers/regulator/twl-regulator.c
+++ b/drivers/regulator/twl-regulator.c
@@ -163,9 +163,9 @@ static int twlreg_disable(struct regulator_dev *rdev)
return grp;
if (twl_class_is_4030())
- grp &= ~P1_GRP_4030;
+ grp &= ~(P1_GRP_4030 | P2_GRP_4030 | P3_GRP_4030);
else
- grp &= ~P1_GRP_6030;
+ grp &= ~(P1_GRP_6030 | P2_GRP_6030 | P3_GRP_6030);
return twlreg_write(info, TWL_MODULE_PM_RECEIVER, VREG_GRP, grp);
}