|
@@ -132,6 +132,10 @@ static int of_overlay_apply_single_device_node(struct of_overlay *ov,
|
|
/* NOTE: Multiple mods of created nodes not supported */
|
|
/* NOTE: Multiple mods of created nodes not supported */
|
|
tchild = of_get_child_by_name(target, cname);
|
|
tchild = of_get_child_by_name(target, cname);
|
|
if (tchild != NULL) {
|
|
if (tchild != NULL) {
|
|
|
|
+ /* new overlay phandle value conflicts with existing value */
|
|
|
|
+ if (child->phandle)
|
|
|
|
+ return -EINVAL;
|
|
|
|
+
|
|
/* apply overlay recursively */
|
|
/* apply overlay recursively */
|
|
ret = of_overlay_apply_one(ov, tchild, child);
|
|
ret = of_overlay_apply_one(ov, tchild, child);
|
|
of_node_put(tchild);
|
|
of_node_put(tchild);
|