efi_loader: fix entry count in bootmgr

Since commit 914df75b0c97 ("efi_loader: fix EFI entry counting")
entry_count is already set to 1 before efi_bootmgr_load() is called. So we
should not increment it when entering the function.

Without the patch an assert error occurs in efi_get_variable() if DEBUG is
defined.

Fixes: 914df75b0c97 ("efi_loader: fix EFI entry counting")
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>

diff --git a/lib/efi_loader/efi_bootmgr.c b/lib/efi_loader/efi_bootmgr.c
index f4b1889dc63a16de1abfa8e0c3f379535eb6e11c..6b68496a80f1aa248e331e9cef2496236c222514 100644 (file)
--- a/lib/efi_loader/efi_bootmgr.c
+++ b/lib/efi_loader/efi_bootmgr.c
@@ -178,8 +178,6 @@ void *efi_bootmgr_load(struct efi_device_path **device_path,
        void *image = NULL;
        int i, num;
 
-       __efi_entry_check();
-
        bs = systab.boottime;
        rs = systab.runtime;
 
@@ -200,7 +198,5 @@ void *efi_bootmgr_load(struct efi_device_path **device_path,
        free(bootorder);
 
 error:
-       __efi_exit_check();
-
        return image;
 }