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

7055a314 · Mark Brown · 52721d9d · 9f7e25ed · 7055a314
Commit 7055a314 authored Jul 24, 2015 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

drivers/regulator/core.c drivers/regulator/core.c +7 -3

No files found.
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1381,9 +1381,13 @@ static int regulator_resolve_supply(struct regulator_dev *rdev)
 	}
 	if (!r) {
-		dev_err(dev, "Failed to resolve %s-supply for %s\n",
+		if (have_full_constraints()) {
-			rdev->supply_name, rdev->desc->name);
+			r = dummy_regulator_rdev;
-		return -EPROBE_DEFER;
+		} else {
+			dev_err(dev, "Failed to resolve %s-supply for %s\n",
+				rdev->supply_name, rdev->desc->name);
+			return -EPROBE_DEFER;
+		}
 	}
 	/* Recursively resolve the supply of the supply */