From: Sascha Hauer <s.hauer@pengutronix.de>
To: Ahmad Fatoum <a.fatoum@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH] ARM: layerscape: ppa: fix error propagation in ppa_init()
Date: Thu, 9 Jul 2020 16:21:26 +0200 [thread overview]
Message-ID: <20200709142126.GG15485@pengutronix.de> (raw)
In-Reply-To: <20200706062704.396-1-a.fatoum@pengutronix.de>
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 <a.fatoum@pengutronix.de>
> ---
> 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
prev parent reply other threads:[~2020-07-09 14:21 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-06 6:27 Ahmad Fatoum
2020-07-09 14:21 ` Sascha Hauer [this message]
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=20200709142126.GG15485@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=a.fatoum@pengutronix.de \
--cc=barebox@lists.infradead.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