mirror of https://gitee.com/openkylin/linux.git
of: overlay: loosen overly strict phandle clash check
When an overlay contains a node that already exists in the live device tree, the overlay node is not allowed to change the phandle of the existing node. The existing check refused to allow an overlay node to set the node phandle even when the existing node did not have a phandle. Relax the check to allow an overlay node to set the phandle value if the existing node does not have a phandle. Signed-off-by: Frank Rowand <frank.rowand@sony.com> Signed-off-by: Rob Herring <robh@kernel.org>
This commit is contained in:
parent
87f242c119
commit
6d0f5470db
|
@ -311,9 +311,9 @@ static int add_changeset_node(struct overlay_changeset *ovcs,
|
|||
return build_changeset_next_level(ovcs, tchild, node, 0);
|
||||
}
|
||||
|
||||
if (node->phandle)
|
||||
return -EINVAL;
|
||||
|
||||
if (node->phandle && tchild->phandle)
|
||||
ret = -EINVAL;
|
||||
else
|
||||
ret = build_changeset_next_level(ovcs, tchild, node, 0);
|
||||
of_node_put(tchild);
|
||||
|
||||
|
|
Loading…
Reference in New Issue