diff options
author | Frank Rowand <frank.rowand@sony.com> | 2018-10-04 20:29:01 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-02-06 17:30:16 +0100 |
commit | 5b3109eb89dd800354481b76a1b856d303d3d2a8 (patch) | |
tree | 9b1462178636b3799c2f85ec590f6f484c98549b | |
parent | 7251e4b835ea820a88de80ecba95e3a0454742cf (diff) | |
download | linux-stable-5b3109eb89dd800354481b76a1b856d303d3d2a8.tar.gz linux-stable-5b3109eb89dd800354481b76a1b856d303d3d2a8.tar.bz2 linux-stable-5b3109eb89dd800354481b76a1b856d303d3d2a8.zip |
of: overlay: do not duplicate properties from overlay for new nodes
commit 8814dc46bd9e347d4de55ec5bf8f16ea54470499 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>
-rw-r--r-- | drivers/of/overlay.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c index 6fd8e6145e10..9808aae4621a 100644 --- a/drivers/of/overlay.c +++ b/drivers/of/overlay.c @@ -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; |