diff options
| author | Igor Opaniuk <igor.opaniuk@toradex.com> | 2020-11-17 11:31:57 +0200 |
|---|---|---|
| committer | Igor Opaniuk <igor.opaniuk@toradex.com> | 2020-11-17 11:31:57 +0200 |
| commit | 664411bde9c033778f85f9ae3a74351406642f6a (patch) | |
| tree | 9e981b04895ab1b0fe6cbe6b5a89af256632fd80 /drivers/regulator/core.c | |
| parent | 14655070177685c8b390e1caec15da757228be1a (diff) | |
| parent | 2544d06afd8d060f35b159809274e4b7477e63e8 (diff) | |
Merge tag 'v5.4.77' into toradex_5.4.y
This is the 5.4.77 stable release
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 ee850cffe154..4da2d6ad22b0 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -4045,6 +4045,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; } |