浏览代码

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>
Mark Brown 8 年之前
父节点
当前提交
43fc99f293
共有 1 个文件被更改,包括 4 次插入2 次删除
  1. 4 2
      drivers/regulator/core.c

+ 4 - 2
drivers/regulator/core.c

@@ -2939,8 +2939,10 @@ static int regulator_set_voltage_unlocked(struct regulator *regulator,
 	if (ret < 0)
 	if (ret < 0)
 		goto out2;
 		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 current_supply_uV;
 		int selector;
 		int selector;