2 files changed, 6 insertions, 0 deletions

diff --git a/arch/x86/platform/efi/quirks.c b/arch/x86/platform/efi/quirks.c
index feb77777c8b8..632b83885867 100644
--- a/arch/x86/platform/efi/quirks.c
+++ b/arch/x86/platform/efi/quirks.c
@@ -513,6 +513,9 @@ int __init efi_reuse_config(u64 tables, int nr_tables)
         void *p, *tablep;
         struct efi_setup_data *data;
 
+        if (nr_tables == 0)
+                return 0;
+
         if (!efi_setup)
                 return 0;
 
diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
index 55b77c576c42..521a541d02ad 100644
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@ -636,6 +636,9 @@ int __init efi_config_init(efi_config_table_type_t *arch_tables)
         void *config_tables;
         int sz, ret;
 
+        if (efi.systab->nr_tables == 0)
+                return 0;
+
         if (efi_enabled(EFI_64BIT))
                 sz = sizeof(efi_config_table_64_t);
         else