Commit 7055a314 authored by Mark Brown's avatar Mark Brown

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

parents 52721d9d 9f7e25ed
...@@ -1381,9 +1381,13 @@ static int regulator_resolve_supply(struct regulator_dev *rdev) ...@@ -1381,9 +1381,13 @@ static int regulator_resolve_supply(struct regulator_dev *rdev)
} }
if (!r) { 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 */ /* Recursively resolve the supply of the supply */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment