[PATCH] fixup! ARM: Initial OP-TEE support

[PATCH] fixup! ARM: Initial OP-TEE support

[Rouven Czerwinski]

---
 arch/arm/lib32/bootm.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/arch/arm/lib32/bootm.c b/arch/arm/lib32/bootm.c
index a653374e5f..180624445d 100644
--- a/arch/arm/lib32/bootm.c
+++ b/arch/arm/lib32/bootm.c
@@ -185,14 +185,13 @@ static int bootm_load_tee_from_file(struct image_data *data)
 	if (read_full(fd, (void *)data->tee_res->start, hdr.init_size) < 0) {
 		pr_err("%s", strerror(errno));
 		ret = -errno;
-		goto out_res;
+		release_region(data->tee_res);
+		goto out;
 	}
 
 	printf("Read optee file to %pa, size 0x%08x\n", (void *)data->tee_res->start, hdr.init_size);
 
 	ret = 0;
-out_res:
-	release_region(data->tee_res);
 out:
 	close(fd);
 
-- 
2.21.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] fixup! ARM: Initial OP-TEE support

[Sascha Hauer]

On Wed, Jun 05, 2019 at 10:33:21AM +0200, Rouven Czerwinski wrote:
> ---
>  arch/arm/lib32/bootm.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)

Applied, thanks

Sascha

> 
> diff --git a/arch/arm/lib32/bootm.c b/arch/arm/lib32/bootm.c
> index a653374e5f..180624445d 100644
> --- a/arch/arm/lib32/bootm.c
> +++ b/arch/arm/lib32/bootm.c
> @@ -185,14 +185,13 @@ static int bootm_load_tee_from_file(struct image_data *data)
>  	if (read_full(fd, (void *)data->tee_res->start, hdr.init_size) < 0) {
>  		pr_err("%s", strerror(errno));
>  		ret = -errno;
> -		goto out_res;
> +		release_region(data->tee_res);
> +		goto out;
>  	}
>  
>  	printf("Read optee file to %pa, size 0x%08x\n", (void *)data->tee_res->start, hdr.init_size);
>  
>  	ret = 0;
> -out_res:
> -	release_region(data->tee_res);
>  out:
>  	close(fd);
>  
> -- 
> 2.21.0
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 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