diff options
| author | Mark Brown <broonie@kernel.org> | 2015-10-06 12:00:38 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-10-06 12:00:38 +0100 |
| commit | 6710f223433588af582c0e4dbecbca72a36c4594 (patch) | |
| tree | 1c176df20e587e2a847a6c0371eb239f57c5b280 | |
| parent | 049e6dde7e57f0054fdc49102e7ef4830c698b46 (diff) | |
| parent | 06423121d9eba0a56b9341cf82b88479017bce14 (diff) | |
| download | linux-6710f223433588af582c0e4dbecbca72a36c4594.tar.bz2 | |
Merge remote-tracking branch 'regulator/fix/core' into regulator-linus
| -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 7849187d91ae..8a34f6acc801 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -1403,6 +1403,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 { |