ACPI / APEI: Fix crash in apei_hest_parse() for acpi=off

[karo-tx-linux.git] / drivers / acpi / apei / hest.c

diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c
index 7f00cf38098f21bdbe0d6a69ba624d18b00f7cb3..f5ef5d54e4ac2ec4c6d4a963ed6b6f3fd7f16ca1 100644 (file)
--- a/drivers/acpi/apei/hest.c
+++ b/drivers/acpi/apei/hest.c
@@ -89,7 +89,7 @@ int apei_hest_parse(apei_hest_func_t func, void *data)
        struct acpi_hest_header *hest_hdr;
        int i, rc, len;
 
-       if (hest_disable)
+       if (hest_disable || !hest_tab)
                return -EINVAL;
 
        hest_hdr = (struct acpi_hest_header *)(hest_tab + 1);
@@ -216,9 +216,6 @@ void __init acpi_hest_init(void)
                return;
        }
 
-       if (acpi_disabled)
-               goto err;
-
        status = acpi_get_table(ACPI_SIG_HEST, 0,
                                (struct acpi_table_header **)&hest_tab);
        if (status == AE_NOT_FOUND)