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

mariux64 · Jul 24, 2015 · 7055a31 · 7055a31
2 parents 52721d9 + 9f7e25e
commit 7055a31
Showing 1 changed file with 7 additions and 3 deletions.
diff --git 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",
-			rdev->supply_name, rdev->desc->name);
-		return -EPROBE_DEFER;
+		if (have_full_constraints()) {
+			r = dummy_regulator_rdev;
+		} 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 */