of: Move setting of pointer to beside test for non-null
authorFrank Rowand <frank.rowand@am.sony.com>
Sat, 29 Oct 2016 06:26:31 +0000 (23:26 -0700)
committerRob Herring <robh@kernel.org>
Tue, 15 Nov 2016 15:17:17 +0000 (09:17 -0600)
Value of pointer was calculated in an earlier block than
where it was used.  Move it down into the block where it
is used, immediately before where is is checked to be valid.

Signed-off-by: Frank Rowand <frank.rowand@am.sony.com>
Signed-off-by: Rob Herring <robh@kernel.org>
drivers/of/resolver.c

index eb78010..53353cc 100644 (file)
@@ -320,8 +320,6 @@ int of_resolve_phandles(struct device_node *overlay)
        overlay_symbols = NULL;
        overlay_fixups = NULL;
 
-       tree_symbols = of_find_node_by_path("/__symbols__");
-
        for_each_child_of_node(overlay, child) {
                if (!of_node_cmp(child->name, "__symbols__"))
                        overlay_symbols = child;
@@ -334,6 +332,7 @@ int of_resolve_phandles(struct device_node *overlay)
                goto out;
        }
 
+       tree_symbols = of_find_node_by_path("/__symbols__");
        if (!tree_symbols) {
                pr_err("no symbols in root of device tree.\n");
                err = -EINVAL;