From: Moritz Fischer <moritz.fischer@ettus.com>
To: linux-kernel@vger.kernel.org
Cc: pantelis.antoniou@konsulko.com, robh+dt@kernel.org,
frowand.list@gmail.com, devicetree@kernel.org,
moritz@pure-entropy.org,
Moritz Fischer <moritz.fischer@ettus.com>
Subject: [PATCH v2] of: Fix issue where code would fall through to error case.
Date: Fri, 18 Nov 2016 16:48:09 -0800 [thread overview]
Message-ID: <1479516489-5898-1-git-send-email-moritz.fischer@ettus.com> (raw)
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 <moritz.fischer@ettus.com>
Reviewed-by: Frank Rowand <frank.rowand@am.sony.com>
---
Hi Rob,
this is Frank's suggestion. I don't have a strong preference one way or the other.
Feel free to pick one or the other.
Cheers,
Moritz
---
drivers/of/resolver.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/of/resolver.c b/drivers/of/resolver.c
index 783bd09..c47404f3 100644
--- a/drivers/of/resolver.c
+++ b/drivers/of/resolver.c
@@ -358,14 +358,14 @@ int of_resolve_phandles(struct device_node *overlay)
err = update_usages_of_a_phandle_reference(overlay, prop, phandle);
if (err)
- break;
+ goto err_out;
}
-
-err_out:
- pr_err("overlay phandle fixup failed: %d\n", err);
out:
of_node_put(tree_symbols);
-
return err;
+
+err_out:
+ pr_err("overlay phandle fixup failed: %d\n", err);
+ goto out;
}
EXPORT_SYMBOL_GPL(of_resolve_phandles);
--
2.7.4
reply other threads:[~2016-11-19 0:48 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1479516489-5898-1-git-send-email-moritz.fischer@ettus.com \
--to=moritz.fischer@ettus.com \
--cc=devicetree@kernel.org \
--cc=frowand.list@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=moritz@pure-entropy.org \
--cc=pantelis.antoniou@konsulko.com \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox