[PATCH] ARM: layerscape: ppa: fix error propagation in ppa_init()

[PATCH] ARM: layerscape: ppa: fix error propagation in ppa_init()

[Ahmad Fatoum]

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(-)

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

Re: [PATCH] ARM: layerscape: ppa: fix error propagation in ppa_init()

[Sascha Hauer]

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