diff options
| author | Tom Rini <trini@konsulko.com> | 2023-07-20 10:19:04 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-07-20 10:19:04 -0400 |
| commit | 0274eb61e1f2a8e053fb028b6c668c67c0b75b9c (patch) | |
| tree | d109142eaa8cba2ead501a544faf857cadc14c95 /lib/efi_loader/efi_boottime.c | |
| parent | 5dcfc99b2b17fa1497adea47a50bf7c7a6ba5709 (diff) | |
| parent | e07368ea57d224557570a6715dcffdbc883a8079 (diff) | |
Merge tag 'efi-2023-10-rc1-2' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request efi-2023-10-rc1-2
UEFI:
* test: avoid function name 'setup' in capsule tests to not treat it as
a fixture
* ensure that device paths for USB block devices are unique
* enable having multiple EFI_LOADER block devices
* use InstallMultipleProtocolInterfaces() in TCG protocol implementation to
increase UEFI compliance
Diffstat (limited to 'lib/efi_loader/efi_boottime.c')
| -rw-r--r-- | lib/efi_loader/efi_boottime.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index 2ca7359f3e1..052fe481e47 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -575,9 +575,9 @@ efi_status_t efi_search_protocol(const efi_handle_t handle, * * Return: status code */ -efi_status_t efi_remove_protocol(const efi_handle_t handle, - const efi_guid_t *protocol, - void *protocol_interface) +static efi_status_t efi_remove_protocol(const efi_handle_t handle, + const efi_guid_t *protocol, + void *protocol_interface) { struct efi_handler *handler; efi_status_t ret; @@ -1357,18 +1357,11 @@ static efi_status_t efi_uninstall_protocol (efi_handle_t handle, const efi_guid_t *protocol, void *protocol_interface) { - struct efi_object *efiobj; struct efi_handler *handler; struct efi_open_protocol_info_item *item; struct efi_open_protocol_info_item *pos; efi_status_t r; - /* Check handle */ - efiobj = efi_search_obj(handle); - if (!efiobj) { - r = EFI_INVALID_PARAMETER; - goto out; - } /* Find the protocol on the handle */ r = efi_search_protocol(handle, protocol, &handler); if (r != EFI_SUCCESS) @@ -1376,7 +1369,7 @@ static efi_status_t efi_uninstall_protocol if (handler->protocol_interface != protocol_interface) return EFI_NOT_FOUND; /* Disconnect controllers */ - r = efi_disconnect_all_drivers(efiobj, protocol, NULL); + r = efi_disconnect_all_drivers(handle, protocol, NULL); if (r != EFI_SUCCESS) { r = EFI_ACCESS_DENIED; goto out; |