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>

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index aff302dfab5de34e92d1a16320ada8f1f9a7330b..3f424ec4fc56cd979626cda1bf1058d91dbc00ce 100644 (file)
--- 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;