diff options
| author | Tom Rini <trini@konsulko.com> | 2020-01-15 12:29:23 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-01-15 12:29:23 -0500 |
| commit | 9d5d74c3ccdc78bac969d25e98eab96872e33b5c (patch) | |
| tree | f2793e4d1149b228e9ee2d04a67f2aae0a804ea7 /lib/efi_driver/efi_uclass.c | |
| parent | fb537657d9e94a8d489eb9463451e9cf90cbe973 (diff) | |
| parent | faadc04180ef05acfd6523b49a2abf37ae61afad (diff) | |
Merge tag 'efi-2020-04-rc1-2' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
Pull request for UEFI sub-system for efi-2020-04-rc1-2
Bug fixes for the UEFI sub-system are provided:
* imply VIDEO_ANSI for correct cursor positioning and colors
* fix issues in the UEFI block device driver
* add missing documentation
Diffstat (limited to 'lib/efi_driver/efi_uclass.c')
| -rw-r--r-- | lib/efi_driver/efi_uclass.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/efi_driver/efi_uclass.c b/lib/efi_driver/efi_uclass.c index b14746e6b1..25b27ece6d 100644 --- a/lib/efi_driver/efi_uclass.c +++ b/lib/efi_driver/efi_uclass.c @@ -112,7 +112,7 @@ static efi_status_t EFIAPI efi_uc_start( struct efi_driver_binding_extended_protocol *bp = (struct efi_driver_binding_extended_protocol *)this; - EFI_ENTRY("%p, %pUl, %ls", this, controller_handle, + EFI_ENTRY("%p, %p, %ls", this, controller_handle, efi_dp_str(remaining_device_path)); /* Attach driver to controller */ @@ -197,9 +197,10 @@ static efi_status_t EFIAPI efi_uc_stop( efi_status_t ret; efi_uintn_t count; struct efi_open_protocol_info_entry *entry_buffer; - efi_guid_t *guid_controller = NULL; + struct efi_driver_binding_extended_protocol *bp = + (struct efi_driver_binding_extended_protocol *)this; - EFI_ENTRY("%p, %pUl, %zu, %p", this, controller_handle, + EFI_ENTRY("%p, %p, %zu, %p", this, controller_handle, number_of_children, child_handle_buffer); /* Destroy provided child controllers */ @@ -217,7 +218,7 @@ static efi_status_t EFIAPI efi_uc_stop( /* Destroy all children */ ret = EFI_CALL(systab.boottime->open_protocol_information( - controller_handle, guid_controller, + controller_handle, bp->ops->protocol, &entry_buffer, &count)); if (ret != EFI_SUCCESS) goto out; @@ -237,7 +238,7 @@ static efi_status_t EFIAPI efi_uc_stop( /* Detach driver from controller */ ret = EFI_CALL(systab.boottime->close_protocol( - controller_handle, guid_controller, + controller_handle, bp->ops->protocol, this->driver_binding_handle, controller_handle)); out: return EFI_EXIT(ret); |