2 files changed, 6 insertions, 2 deletions

diff --git a/arch/x86_64/kernel/early-quirks.c b/arch/x86_64/kernel/early-quirks.c
index bd30d138113..8047ea8c2ab 100644
--- a/arch/x86_64/kernel/early-quirks.c
+++ b/arch/x86_64/kernel/early-quirks.c
@@ -53,7 +53,9 @@ static void nvidia_bugs(void)
                 return;
 
         nvidia_hpet_detected = 0;
-        acpi_table_parse(ACPI_SIG_HPET, nvidia_hpet_check);
+        if (acpi_table_parse(ACPI_SIG_HPET, nvidia_hpet_check))
+                return;
+
         if (nvidia_hpet_detected == 0) {
                 acpi_skip_timer_override = 1;
                 printk(KERN_INFO "Nvidia board "
diff --git a/arch/x86_64/pci/mmconfig.c b/arch/x86_64/pci/mmconfig.c
index faabb6e87f1..98202cb50d8 100644
--- a/arch/x86_64/pci/mmconfig.c
+++ b/arch/x86_64/pci/mmconfig.c
@@ -170,7 +170,9 @@ void __init pci_mmcfg_init(int type)
         if ((pci_probe & PCI_PROBE_MMCONF) == 0)
                 return;
 
-        acpi_table_parse(ACPI_SIG_MCFG, acpi_parse_mcfg);
+        if (acpi_table_parse(ACPI_SIG_MCFG, acpi_parse_mcfg))
+                return;
+
         if ((pci_mmcfg_config_num == 0) ||
             (pci_mmcfg_config == NULL) ||
             (pci_mmcfg_config[0].address == 0))