Merge remote-tracking branch 'regulator/fix/core' into regulator-linus

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 {