Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753000AbcKQXcR (ORCPT ); Thu, 17 Nov 2016 18:32:17 -0500 Received: from mail-pg0-f46.google.com ([74.125.83.46]:34546 "EHLO mail-pg0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751914AbcKQXcP (ORCPT ); Thu, 17 Nov 2016 18:32:15 -0500 X-Greylist: delayed 341 seconds by postgrey-1.27 at vger.kernel.org; Thu, 17 Nov 2016 18:32:15 EST From: Moritz Fischer To: linux-kernel@vger.kernel.org Cc: pantelis.antoniou@konsulko.com, robh+dt@kernel.org, frowand.list@gmail.com, moritz@pure-entropy.org, devicetree@vger.kernel.org, Moritz Fischer Subject: [PATCH] of: Fix issue where code would fall through to error case. Date: Thu, 17 Nov 2016 15:25:57 -0800 Message-Id: <1479425157-6235-1-git-send-email-moritz.fischer@ettus.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 771 Lines: 30 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 --- drivers/of/resolver.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/of/resolver.c b/drivers/of/resolver.c index 783bd09..785076d 100644 --- a/drivers/of/resolver.c +++ b/drivers/of/resolver.c @@ -358,9 +358,13 @@ int of_resolve_phandles(struct device_node *overlay) err = update_usages_of_a_phandle_reference(overlay, prop, phandle); if (err) - break; + goto err_out; } + of_node_put(tree_symbols); + + return 0; + err_out: pr_err("overlay phandle fixup failed: %d\n", err); out: -- 2.7.4