diff options
| author | Mark Brown <broonie@kernel.org> | 2017-04-13 18:36:59 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-04-14 18:07:51 +0100 |
| commit | 43fc99f293cc802866bea904ca2f1f8573f236f7 (patch) | |
| tree | f6726b8e065d57f4d055af0753218ba1ef7b6575 /drivers/regulator/core.c | |
| parent | fd086045559d90cd7854818b4c60a7119eda6231 (diff) | |
| download | op-kernel-dev-43fc99f293cc802866bea904ca2f1f8573f236f7.zip op-kernel-dev-43fc99f293cc802866bea904ca2f1f8573f236f7.tar.gz | |
regulator: core: Only propagate voltage changes to if it can change voltages
When we are propagating voltage changes to parent regulators don't
bother if the parent does not have permission to change voltages. This
simplifies error checking in the function for cases where the regulator
lacks some of the voltage operations.
Reported-by: Dong Aisheng <aisheng.dong@nxp.com>
Tested-by: Dong Aisheng <aisheng.dong@nxp.com>
Reviewed-by: Dong Aisheng <aisheng.dong@nxp.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/regulator/core.c')
| -rw-r--r-- | drivers/regulator/core.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index aff302d..3f424ec 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -2939,8 +2939,10 @@ static int regulator_set_voltage_unlocked(struct regulator *regulator, if (ret < 0) goto out2; - if (rdev->supply && (rdev->desc->min_dropout_uV || - !rdev->desc->ops->get_voltage)) { + if (rdev->supply && + regulator_ops_is_valid(rdev->supply->rdev, + REGULATOR_CHANGE_VOLTAGE) && + (rdev->desc->min_dropout_uV || !rdev->desc->ops->get_voltage)) { int current_supply_uV; int selector; |
