[PATCH 1/2] regulator: core: Only propagate voltage changes to if it can change voltages

From: Mark Brown
Date: Thu Apr 13 2017 - 14:03:39 EST


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@xxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
---

Untested.

drivers/regulator/core.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 82205cc5daa7..2b464a286451 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -2959,8 +2959,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;

--
2.11.0