diff options
| author | Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com> | 2016-03-26 11:28:15 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-03-28 12:39:58 +0300 |
| commit | 32e5deac3627a508f43806788dafa933b51d5d46 (patch) | |
| tree | 9121fb2434cffa9b59d606d0de21ed1399f7f3fb /drivers/regulator/twl-regulator.c | |
| parent | 2330b05c095bdeaaf1261c54cd2d4b9127496996 (diff) | |
| download | linux-32e5deac3627a508f43806788dafa933b51d5d46.tar.xz | |
regulator: twl: Regulator mode should not depend on regulator enabled state
When machine constraints are applied, regulator framework first sets
initial mode (if any) and then enables the regulator if needed. The current
code in twl4030reg_set_mode always checks if the regulator is enabled
before applying the mode. That results in -EACCES error returned for
"always-on" regulators which have "initial-mode" set in the board DTS. Fix
that by removing the unneeded check.
Signed-off-by: Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/regulator/twl-regulator.c')
| -rw-r--r-- | drivers/regulator/twl-regulator.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/regulator/twl-regulator.c b/drivers/regulator/twl-regulator.c index aad748b00e1a..7355616194ab 100644 --- a/drivers/regulator/twl-regulator.c +++ b/drivers/regulator/twl-regulator.c @@ -371,7 +371,6 @@ static int twl4030reg_set_mode(struct regulator_dev *rdev, unsigned mode) { struct twlreg_info *info = rdev_get_drvdata(rdev); unsigned message; - int status; /* We can only set the mode through state machine commands... */ switch (mode) { @@ -385,13 +384,6 @@ static int twl4030reg_set_mode(struct regulator_dev *rdev, unsigned mode) return -EINVAL; } - /* Ensure the resource is associated with some group */ - status = twlreg_grp(rdev); - if (status < 0) - return status; - if (!(status & (P3_GRP_4030 | P2_GRP_4030 | P1_GRP_4030))) - return -EACCES; - return twl4030_send_pb_msg(message); } |