Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753039AbcKQXlf (ORCPT ); Thu, 17 Nov 2016 18:41:35 -0500 Received: from mail-pg0-f66.google.com ([74.125.83.66]:36235 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752336AbcKQXld (ORCPT ); Thu, 17 Nov 2016 18:41:33 -0500 Subject: Re: [PATCH] of: Fix issue where code would fall through to error case. To: Moritz Fischer , linux-kernel@vger.kernel.org, robh+dt@kernel.org References: <1479425157-6235-1-git-send-email-moritz.fischer@ettus.com> Cc: pantelis.antoniou@konsulko.com, moritz@pure-entropy.org, devicetree@vger.kernel.org From: Frank Rowand Message-ID: <582E3FFC.80305@gmail.com> Date: Thu, 17 Nov 2016 15:40:44 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 In-Reply-To: <1479425157-6235-1-git-send-email-moritz.fischer@ettus.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 967 Lines: 37 On 11/17/16 15:25, Moritz Fischer wrote: > 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: Thanks for catching that. Rob, please apply. Reviewed-by: Frank Rowand -Frank