Skip to content

Commit

Permalink
twl-regulator: Fix reg_disable functionality for 4030 and 6030
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Juha Keski-Saari authored and Liam Girdwood committed Dec 17, 2009
1 parent 53b8a9d commit cf9836f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/regulator/twl-regulator.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down

0 comments on commit cf9836f

Please sign in to comment.