diff --git a/[refs] b/[refs] index 75826ec1bd4a..acca99384bfb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 97c227cb51ddcf52c66f7a7fba69237026418b56 +refs/heads/master: 4bdae98f1a456ea1fea5ea02f9249d23bceab75b diff --git a/trunk/drivers/acpi/hest.c b/trunk/drivers/acpi/hest.c index 4bb18c980ac6..1c527a192872 100644 --- a/trunk/drivers/acpi/hest.c +++ b/trunk/drivers/acpi/hest.c @@ -123,6 +123,10 @@ int acpi_hest_firmware_first_pci(struct pci_dev *pci) { acpi_status status = AE_NOT_FOUND; struct acpi_table_header *hest = NULL; + + if (acpi_disabled) + return 0; + status = acpi_get_table(ACPI_SIG_HEST, 1, &hest); if (ACPI_SUCCESS(status)) {