From b5104821c1b7c084f908afd0f1d3fc3c506df3d0 Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Tue, 25 Jul 2017 20:17:59 -0400 Subject: [PATCH] efi_loader: remove double EFI_EXIT() with efi_unsupported Probably this went unnoticed before, but it causes problems with addition of 804b1d73 ("efi_loader: log EFI return values too") Signed-off-by: Rob Clark Signed-off-by: Alexander Graf --- lib/efi_loader/efi_boottime.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index 97be7b82e4..9a1a93fade 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -141,7 +141,7 @@ static unsigned long EFIAPI efi_raise_tpl(UINTN new_tpl) static void EFIAPI efi_restore_tpl(UINTN old_tpl) { EFI_ENTRY("0x%zx", old_tpl); - EFI_EXIT(efi_unsupported(__func__)); + efi_unsupported(__func__); } static efi_status_t EFIAPI efi_allocate_pages_ext(int type, int memory_type, @@ -818,7 +818,7 @@ static efi_status_t EFIAPI efi_set_watchdog_timer(unsigned long timeout, { EFI_ENTRY("%ld, 0x%"PRIx64", %ld, %p", timeout, watchdog_code, data_size, watchdog_data); - return EFI_EXIT(efi_unsupported(__func__)); + return efi_unsupported(__func__); } static efi_status_t EFIAPI efi_connect_controller( -- 2.25.1