Skip to content

Commit

Permalink
of: overlay: do not duplicate properties from overlay for new nodes
Browse files Browse the repository at this point in the history
commit 8814dc4 upstream.

When allocating a new node, add_changeset_node() was duplicating the
properties from the respective node in the overlay instead of
allocating a node with no properties.

When this patch is applied the errors reported by the devictree
unittest from patch "of: overlay: add tests to validate kfrees from
overlay removal" will no longer occur.  These error messages are of
the form:

   "OF: ERROR: ..."

and the unittest results will change from:

   ### dt-test ### end of unittest - 203 passed, 7 failed

to

   ### dt-test ### end of unittest - 210 passed, 0 failed

Tested-by: Alan Tull <atull@kernel.org>
Signed-off-by: Frank Rowand <frank.rowand@sony.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Frank Rowand authored and Greg Kroah-Hartman committed Feb 6, 2019
1 parent cf03712 commit e6ae333
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/of/overlay.c
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ static int add_changeset_node(struct overlay_changeset *ovcs,
break;

if (!tchild) {
tchild = __of_node_dup(node, node_kbasename);
tchild = __of_node_dup(NULL, node_kbasename);
if (!tchild)
return -ENOMEM;

Expand Down

0 comments on commit e6ae333

Please sign in to comment.