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

6710f223 · Mark Brown · 049e6dde · 06423121 · 6710f223
Commit 6710f223 authored Oct 06, 2015 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

drivers/regulator/core.c drivers/regulator/core.c +4 -0

No files found.
--- 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 {