Skip to content

Commit 7ba48d2

Browse files
osctobegregkh
authored andcommitted
regulator: defer probe when trying to get voltage from unresolved supply
commit cf1ad55 upstream. regulator_get_voltage_rdev() is called in regulator probe() when applying machine constraints. The "fixed" commit exposed the problem that non-bypassed regulators can forward the request to its parent (like bypassed ones) supply. Return -EPROBE_DEFER when the supply is expected but not resolved yet. Fixes: aea6cb9 ("regulator: resolve supply after creating regulator") Cc: stable@vger.kernel.org Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl> Reported-by: Ondřej Jirman <megous@megous.com> Reported-by: Corentin Labbe <clabbe.montjoie@gmail.com> Tested-by: Ondřej Jirman <megous@megous.com> Link: https://lore.kernel.org/r/a9041d68b4d35e4a2dd71629c8a6422662acb5ee.1604351936.git.mirq-linux@rere.qmqm.pl Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent f22d020 commit 7ba48d2

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

drivers/regulator/core.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4128,6 +4128,8 @@ int regulator_get_voltage_rdev(struct regulator_dev *rdev)
41284128
ret = rdev->desc->fixed_uV;
41294129
} else if (rdev->supply) {
41304130
ret = regulator_get_voltage_rdev(rdev->supply->rdev);
4131+
} else if (rdev->supply_name) {
4132+
return -EPROBE_DEFER;
41314133
} else {
41324134
return -EINVAL;
41334135
}

0 commit comments

Comments
 (0)