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>

diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c
index 4cdee169a5ab634a515094e2965291cfc7443d64..791753321ed2d764f854c62c1bb8a5e0424f8b2e 100644 (file)
--- a/drivers/of/overlay.c
+++ b/drivers/of/overlay.c
@@ -311,10 +311,10 @@ static int add_changeset_node(struct overlay_changeset *ovcs,
                return build_changeset_next_level(ovcs, tchild, node, 0);
        }
 
-       if (node->phandle)
-               return -EINVAL;
-
-       ret = build_changeset_next_level(ovcs, tchild, node, 0);
+       if (node->phandle && tchild->phandle)
+               ret = -EINVAL;
+       else
+               ret = build_changeset_next_level(ovcs, tchild, node, 0);
        of_node_put(tchild);
 
        return ret;