colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bootm: Adjust position of unmap_sysmem() in boot_get_kernel()

Browse Source 
These unmaps should happen regardless of the return value. Move them
before the 'return' statement.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Simon Glass
2023-11-18 14:05:01 -07:00
committed by Tom Rini
parent 7721e71f03
commit 4f77169c94
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
boot/bootm.c
View File

@@ -222,12 +222,12 @@ static int boot_get_kernel(const char *cmd_name, const char *addr_fit,
printf("## Booting Android Image at 0x%08lx ...\n", img_addr); printf("## Booting Android Image at 0x%08lx ...\n", img_addr);
ret = android_image_get_kernel(boot_img, vendor_boot_img, ret = android_image_get_kernel(boot_img, vendor_boot_img,
images->verify, os_data, os_len); images->verify, os_data, os_len);
if (ret)
return ret;
if (IS_ENABLED(CONFIG_CMD_ABOOTIMG)) { if (IS_ENABLED(CONFIG_CMD_ABOOTIMG)) {
unmap_sysmem(vendor_boot_img); unmap_sysmem(vendor_boot_img);
unmap_sysmem(boot_img); unmap_sysmem(boot_img);
} }
if (ret)
return ret;
break; break;
} }
#endif #endif