diff options
| author | Moritz Fischer <mdf@kernel.org> | 2016-12-01 22:10:25 -0800 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2016-12-09 10:33:03 -0600 |
| commit | 32bed310ad32b1cf66525fae89913d76dde4d797 (patch) | |
| tree | 59ebec551d724fbc711193fc48954dfa543314ba /drivers/of | |
| parent | 4aa663444048396799b49b5b782552c1ba15c39d (diff) | |
| download | blackbird-obmc-linux-32bed310ad32b1cf66525fae89913d76dde4d797.tar.gz blackbird-obmc-linux-32bed310ad32b1cf66525fae89913d76dde4d797.zip | |
of: Fix issue where code would fall through to error case.
No longer fall through into the error case that prints out
an error if no error (err = 0) occurred.
Fixes d9181b20a83(of: Add back an error message, restructured)
Signed-off-by: Moritz Fischer <mdf@kernel.org>
Reviewed-by: Frank Rowand <frank.rowand@am.sony.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Diffstat (limited to 'drivers/of')
| -rw-r--r-- | drivers/of/resolver.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/of/resolver.c b/drivers/of/resolver.c index 783bd09463b5..8bf12e904fd2 100644 --- a/drivers/of/resolver.c +++ b/drivers/of/resolver.c @@ -298,12 +298,12 @@ int of_resolve_phandles(struct device_node *overlay) if (!overlay) { pr_err("null overlay\n"); err = -EINVAL; - goto err_out; + goto out; } if (!of_node_check_flag(overlay, OF_DETACHED)) { pr_err("overlay not detached\n"); err = -EINVAL; - goto err_out; + goto out; } phandle_delta = live_tree_max_phandle() + 1; @@ -315,7 +315,7 @@ int of_resolve_phandles(struct device_node *overlay) err = adjust_local_phandle_references(local_fixups, overlay, phandle_delta); if (err) - goto err_out; + goto out; overlay_fixups = NULL; @@ -333,7 +333,7 @@ int of_resolve_phandles(struct device_node *overlay) if (!tree_symbols) { pr_err("no symbols in root of device tree.\n"); err = -EINVAL; - goto err_out; + goto out; } for_each_property_of_node(overlay_fixups, prop) { @@ -345,12 +345,12 @@ int of_resolve_phandles(struct device_node *overlay) err = of_property_read_string(tree_symbols, prop->name, &refpath); if (err) - goto err_out; + goto out; refnode = of_find_node_by_path(refpath); if (!refnode) { err = -ENOENT; - goto err_out; + goto out; } phandle = refnode->phandle; @@ -361,9 +361,9 @@ int of_resolve_phandles(struct device_node *overlay) break; } -err_out: - pr_err("overlay phandle fixup failed: %d\n", err); out: + if (err) + pr_err("overlay phandle fixup failed: %d\n", err); of_node_put(tree_symbols); return err; |
