diff options
| author | Tom Rini <trini@konsulko.com> | 2021-11-26 17:10:53 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-11-26 17:10:53 -0500 |
| commit | 693650b15d04cd5a5861bd3136c9ed9e23f95c41 (patch) | |
| tree | b4a3b3ca5d9b6b6f10e3d6880f1caa17219776c2 /lib/efi_loader/efi_disk.c | |
| parent | 2ad8d0cb950da2233a2ec030533f4e54c6d04126 (diff) | |
| parent | 2b5e7108594d4e100c88f44353d1fed6456d6471 (diff) | |
Merge tag 'efi-2022-01-rc3-2' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request for efi-2022-01-rc3-2
Test:
* fix pylint warnings
UEFI:
* disable interrupts before removing devices in ExitBootServices()
* implement poweroff in efi_system_reset() on sandbox
* allow booting via EFI even if some block device fails
Diffstat (limited to 'lib/efi_loader/efi_disk.c')
| -rw-r--r-- | lib/efi_loader/efi_disk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c index ef8b5c88ff..45127d1768 100644 --- a/lib/efi_loader/efi_disk.c +++ b/lib/efi_loader/efi_disk.c @@ -424,7 +424,7 @@ static efi_status_t efi_disk_add_dev( &efi_block_io_guid, &diskobj->ops, guid, NULL, NULL)); if (ret != EFI_SUCCESS) - return ret; + goto error; /* * On partitions or whole disks without partitions install the @@ -573,7 +573,7 @@ efi_status_t efi_disk_register(void) if (ret) { log_err("ERROR: failure to add disk device %s, r = %lu\n", dev->name, ret & ~EFI_ERROR_MASK); - return ret; + continue; } disks++; |