Merge branch 'acpi-cleanup' into fixes

* acpi-cleanup: ACPI / APEI: Fix crash in apei_hest_parse() for acpi=off
mariux64 · Feb 22, 2013 · bf900af · bf900af
2 parents d3caf89 + a84363d
commit bf900af
Showing 1 changed file with 1 addition and 4 deletions.
diff --git 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)