提交 7055a314 编写于 作者: M Mark Brown

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

...@@ -1381,10 +1381,14 @@ static int regulator_resolve_supply(struct regulator_dev *rdev) ...@@ -1381,10 +1381,14 @@ static int regulator_resolve_supply(struct regulator_dev *rdev)
} }
if (!r) { if (!r) {
if (have_full_constraints()) {
r = dummy_regulator_rdev;
} else {
dev_err(dev, "Failed to resolve %s-supply for %s\n", dev_err(dev, "Failed to resolve %s-supply for %s\n",
rdev->supply_name, rdev->desc->name); rdev->supply_name, rdev->desc->name);
return -EPROBE_DEFER; return -EPROBE_DEFER;
} }
}
/* Recursively resolve the supply of the supply */ /* Recursively resolve the supply of the supply */
ret = regulator_resolve_supply(r); ret = regulator_resolve_supply(r);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册