Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

[mirror_ubuntu-artful-kernel.git] / drivers / of / overlay.c

diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c
index 24e025f7929932cb1dcf8c0a834b308a30b99fe2..54e5af9d737742db1b4cb83ef3101a4ee41c7e27 100644 (file)
--- a/drivers/of/overlay.c
+++ b/drivers/of/overlay.c
@@ -149,6 +149,7 @@ static int of_overlay_apply_one(struct of_overlay *ov,
                        pr_err("%s: Failed to apply single node @%s/%s\n",
                                        __func__, target->full_name,
                                        child->name);
+                       of_node_put(child);
                        return ret;
                }
        }
@@ -417,8 +418,10 @@ static int overlay_subtree_check(struct device_node *tree,
                return 1;
 
        for_each_child_of_node(tree, child) {
-               if (overlay_subtree_check(child, dn))
+               if (overlay_subtree_check(child, dn)) {
+                       of_node_put(child);
                        return 1;
+               }
        }
 
        return 0;