diff options
| author | Mark Brown <broonie@kernel.org> | 2015-10-01 10:59:48 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-22 14:49:24 -0700 |
| commit | 58bee20eeae7f50ec2471f250fdfcd04badbd184 (patch) | |
| tree | 0faf0a4ee8f1fda20a6d2586de0e29423fd7ef14 /drivers | |
| parent | 24a51705489274a705fdca494321e5ddc5b18757 (diff) | |
regulator: core: Handle probe deferral from DT when resolving supplies
commit 06423121d9eba0a56b9341cf82b88479017bce14 upstream.
When resolving regulator-regulator supplies we ignore probe deferral
returns from regulator_dev_lookup() (such as are generated for DT when
we can see a supply is registered) and just fall back to the dummy
regulator if there are full constraints (as is the case for DT). This
means that probe deferral is broken for DT systems, fix that by paying
attention to -EPROBE_DEFER return codes like we do -ENODEV.
A further patch will simplify this further, this is a minimal fix for
the specific issue.
Fixes: 9f7e25edb1575a6d2 (regulator: core: Handle full constraints systems when resolving supplies)
Reported-by: Sascha Hauer <s.hauer@pengutronix.de>
Tested-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Mark Brown <broonnie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/regulator/core.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 3b7058242b71..5081533858f1 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -1385,6 +1385,10 @@ static int regulator_resolve_supply(struct regulator_dev *rdev) return 0; } + /* Did the lookup explicitly defer for us? */ + if (ret == -EPROBE_DEFER) + return ret; + if (have_full_constraints()) { r = dummy_regulator_rdev; } else { |