aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-02-23 00:42:01 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-02-23 00:42:01 +0100
commitbf900afba96bf34038bf2c944bbcad7424a40051 (patch)
treee342590634b304feda22aeff7ab3346b808f9fe7
parentd3caf89433755279caa0196c093a87fc5e63bd36 (diff)
parenta84363d6fdba14663b6b155eec604b6c0f6f8866 (diff)
downloadvexpress-lsk-bf900afba96bf34038bf2c944bbcad7424a40051.tar.gz
Merge branch 'acpi-cleanup' into fixes
* acpi-cleanup: ACPI / APEI: Fix crash in apei_hest_parse() for acpi=off
-rw-r--r--drivers/acpi/apei/hest.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c
index 7f00cf38098..f5ef5d54e4a 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)