From: Frank Rowand Date: Sat, 29 Oct 2016 06:26:31 +0000 (-0700) Subject: of: Move setting of pointer to beside test for non-null X-Git-Tag: v4.10-rc1~98^2~15 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=4458db4c9b7363a60d9ad07275fb2eea4ecf3b52;p=linux.git of: Move setting of pointer to beside test for non-null 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 Signed-off-by: Rob Herring --- diff --git a/drivers/of/resolver.c b/drivers/of/resolver.c index eb78010c21a3..53353cc8f2bb 100644 --- a/drivers/of/resolver.c +++ b/drivers/of/resolver.c @@ -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;