summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2022-11-16 11:08:51 -0500
committerTom Rini <[email protected]>2022-11-16 11:08:51 -0500
commitbebb393b340295edb9ba50a996fc0510cd1b6ac0 (patch)
tree3eda675d84dbfedc19aed9b6da8fd1c7a5574930 /cmd
parentd78cccb1acd683083560d71753c116c6e38e2491 (diff)
parenta930d69baa958d5f308b3910187c5f3c083fe171 (diff)
Merge tag 'efi-2023-01-rc2' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request for efi-2023-01-rc2 Documentation: * fix building with Sphinx 5.0+ * man-pages for cmp and bootd commands UEFI: * Avoid unaligned access in efi_file_from_path() * More bug fixes
Diffstat (limited to 'cmd')
-rw-r--r--cmd/eficonfig.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/cmd/eficonfig.c b/cmd/eficonfig.c
index 2595dd95631..2b143894d37 100644
--- a/cmd/eficonfig.c
+++ b/cmd/eficonfig.c
@@ -1527,8 +1527,6 @@ static efi_status_t eficonfig_edit_boot_option(u16 *varname, struct eficonfig_bo
}
ret = eficonfig_set_boot_option(varname, final_dp, final_dp_size, bo->description, tmp);
- if (ret != EFI_SUCCESS)
- goto out;
out:
free(tmp);
free(bo->optional_data);
@@ -2280,10 +2278,10 @@ efi_status_t eficonfig_delete_invalid_boot_option(struct eficonfig_media_boot_op
{
u32 i, j;
efi_uintn_t size;
- efi_status_t ret;
void *load_option;
struct efi_load_option lo;
u16 varname[] = u"Boot####";
+ efi_status_t ret = EFI_SUCCESS;
for (i = 0; i <= 0xFFFF; i++) {
efi_uintn_t tmp;