From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jtXQV-0001Ar-91 for barebox@lists.infradead.org; Thu, 09 Jul 2020 14:21:28 +0000 Date: Thu, 9 Jul 2020 16:21:26 +0200 From: Sascha Hauer Message-ID: <20200709142126.GG15485@pengutronix.de> References: <20200706062704.396-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200706062704.396-1-a.fatoum@pengutronix.de> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: Re: [PATCH] ARM: layerscape: ppa: fix error propagation in ppa_init() To: Ahmad Fatoum Cc: barebox@lists.infradead.org On Mon, Jul 06, 2020 at 08:27:04AM +0200, Ahmad Fatoum wrote: > On fit_open_image, we returned PTR_ERR(fit) instead of the correct ret. > We also didn't call fit_close as we should. Fix this. > > Signed-off-by: Ahmad Fatoum > --- > arch/arm/mach-layerscape/ppa.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) Applied, thanks Sascha > > diff --git a/arch/arm/mach-layerscape/ppa.c b/arch/arm/mach-layerscape/ppa.c > index 477e8947813c..6ab7659be730 100644 > --- a/arch/arm/mach-layerscape/ppa.c > +++ b/arch/arm/mach-layerscape/ppa.c > @@ -77,8 +77,8 @@ static int ppa_init(void *ppa, size_t ppa_size, void *sec_firmware_addr) > if (IS_ERR(conf)) { > pr_err("Cannot open default config in ppa FIT image: %s\n", > strerrorp(conf)); > - fit_close(fit); > - return PTR_ERR(fit); > + ret = PTR_ERR(fit); > + goto err; > } > > > @@ -86,7 +86,6 @@ static int ppa_init(void *ppa, size_t ppa_size, void *sec_firmware_addr) > if (ret) { > pr_err("Cannot open firmware image in ppa FIT image: %s\n", > strerror(-ret)); > - ret = PTR_ERR(fit); > goto err; > } > > @@ -107,7 +106,7 @@ static int ppa_init(void *ppa, size_t ppa_size, void *sec_firmware_addr) > err: > fit_close(fit); > > - return 0; > + return ret; > } > > int ls1046a_ppa_init(resource_size_t ppa_start, resource_size_t ppa_size) > -- > 2.27.0 > > > _______________________________________________ > barebox mailing list > barebox@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/barebox > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox