diff options
| author |   Michał Mirosław <mirq-linux@rere.qmqm.pl> | 2020-11-02 22:27:27 +0100 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2020-11-03 13:19:01 +0000 |
| commit | cf1ad559a20d1930aa7b47a52f54e1f8718de301 (patch) | |
| tree | d1e5fe6e3e3f9b29f01b608755550f9692e9d79c /drivers/regulator/core.c | |
| parent | Merge tag 'v5.10-rc1' into regulator-5.10 (diff) | |
| download | linux-dev-cf1ad559a20d1930aa7b47a52f54e1f8718de301.tar.xz linux-dev-cf1ad559a20d1930aa7b47a52f54e1f8718de301.zip | |
regulator: defer probe when trying to get voltage from unresolved supply
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: aea6cb99703e ("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>
Diffstat (limited to 'drivers/regulator/core.c')
| -rw-r--r-- | drivers/regulator/core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index a4ffd71696da..a5ad553da8cd 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -4165,6 +4165,8 @@ int regulator_get_voltage_rdev(struct regulator_dev *rdev) ret = rdev->desc->fixed_uV; } else if (rdev->supply) { ret = regulator_get_voltage_rdev(rdev->supply->rdev); + } else if (rdev->supply_name) { + return -EPROBE_DEFER; } else { return -EINVAL; } |