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

git-mirror · Oct 6, 2015 · 6710f22 · 6710f22
2 parents 049e6dd + 0642312
commit 6710f22
Showing 1 changed file with 4 additions and 0 deletions.
diff --git 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 {