diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-02-22 23:42:01 (GMT) |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-02-22 23:42:01 (GMT) |
| commit | bf900afba96bf34038bf2c944bbcad7424a40051 (patch) | |
| tree | e342590634b304feda22aeff7ab3346b808f9fe7 /drivers/acpi | |
| parent | d3caf89433755279caa0196c093a87fc5e63bd36 (diff) | |
| parent | a84363d6fdba14663b6b155eec604b6c0f6f8866 (diff) | |
| download | linux-bf900afba96bf34038bf2c944bbcad7424a40051.tar.xz | |
Merge branch 'acpi-cleanup' into fixes
* acpi-cleanup:
ACPI / APEI: Fix crash in apei_hest_parse() for acpi=off
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/apei/hest.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c index 7f00cf3..f5ef5d5 100644 --- 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) |