From: Mark Brown Date: Thu, 13 Apr 2017 17:36:59 +0000 (+0100) Subject: regulator: core: Only propagate voltage changes to if it can change voltages X-Git-Tag: v4.12-rc1~111^2~4^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43fc99f293cc802866bea904ca2f1f8573f236f7;p=thirdparty%2Fkernel%2Flinux.git 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 Tested-by: Dong Aisheng Reviewed-by: Dong Aisheng Signed-off-by: Mark Brown --- diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index aff302dfab5de..3f424ec4fc56c 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;