diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-11-05 11:11:40 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-11-05 11:11:40 -0800 |
| commit | 3d55978f95ca3cb66ed9161f4ef5d6e6b9569c2b (patch) | |
| tree | dea7abfea53944b0ce658d8cba666763a77b8e25 /drivers | |
| parent | f786dfa3745b92f2fa91e0a0b9f3509907111d96 (diff) | |
| parent | cf1ad559a20d1930aa7b47a52f54e1f8718de301 (diff) | |
| download | linux-3d55978f95ca3cb66ed9161f4ef5d6e6b9569c2b.tar.bz2 | |
Merge tag 'regulator-fix-v5.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator fixes from Mark Brown:
"An addition to MAINTAINERS plus a fix for a nasty bootstrapping
problem which caused problems when we need to read the voltage of a
regulator that is not yet available during initialization, we were not
correctly distinguishing between this case and the case where a
regulator is put into a bypass mode"
* tag 'regulator-fix-v5.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
regulator: defer probe when trying to get voltage from unresolved supply
MAINTAINERS: Add entry for Qualcomm IPQ4019 VQMMC regulator
Diffstat (limited to 'drivers')
| -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; } |