X-Git-Url: http://git.agner.ch/gitweb/?p=linux-drm-fsl-dcu.git;a=blobdiff_plain;f=drivers%2Fregulator%2Fcore.c;h=78387a6cbae59e40a6fb05fc255647cacfe3209b;hp=80a123e8d0c33b94eed6f29b769fda0ff1b16aef;hb=4c7d83e8a8106d90d4eff971c8d070f718ac4f9c;hpb=36a1f1b6ddc6d1442424e29548e790633ca39c7b

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 80a123e8d0c3..78387a6cbae5 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1385,9 +1385,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 */