Commit 6710f223 authored by Mark Brown's avatar Mark Brown

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

parents 049e6dde 06423121
...@@ -1403,6 +1403,10 @@ static int regulator_resolve_supply(struct regulator_dev *rdev) ...@@ -1403,6 +1403,10 @@ static int regulator_resolve_supply(struct regulator_dev *rdev)
return 0; return 0;
} }
/* Did the lookup explicitly defer for us? */
if (ret == -EPROBE_DEFER)
return ret;
if (have_full_constraints()) { if (have_full_constraints()) {
r = dummy_regulator_rdev; r = dummy_regulator_rdev;
} else { } else {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment