aboutsummaryrefslogtreecommitdiff
path: root/lib/efi_loader/efi_disk.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2021-11-29 12:00:57 -0500
committerTom Rini <trini@konsulko.com>2021-11-29 12:00:57 -0500
commit2402c93130c09b881f9cc1369459fb49d9fa0f74 (patch)
treeb98fcb4632c62e8693d8ee1acfa3af55c52f634a /lib/efi_loader/efi_disk.c
parentc087b5ad974441d1408c028eb7087d86b6d127e9 (diff)
parentade37460a944aed36ae6ee634c4d4a9a22690461 (diff)
downloadu-boot-2402c93130c09b881f9cc1369459fb49d9fa0f74.zip
u-boot-2402c93130c09b881f9cc1369459fb49d9fa0f74.tar.gz
u-boot-2402c93130c09b881f9cc1369459fb49d9fa0f74.tar.bz2
Merge tag 'v2022.01-rc3' into next
Prepare v2022.01-rc3 Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'lib/efi_loader/efi_disk.c')
-rw-r--r--lib/efi_loader/efi_disk.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c
index ef8b5c8..45127d1 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++;