redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

Merge branch 'acpi-cleanup' into fixes

Browse source 
* acpi-cleanup:
  ACPI / APEI: Fix crash in apei_hest_parse() for acpi=off
This commit is contained in:
Rafael J. Wysocki 2013-02-23 00:42:01 +01:00
parent d3caf89433 a84363d6fd
commit bf900afba9
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/acpi/apei/hest.c
View file

@ -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)