From 1d36c5ebab2d6d71da6654b7074e3611f2fe1264 Mon Sep 17 00:00:00 2001 From: Len Brown Date: Tue, 7 Jul 2009 23:22:58 -0400 Subject: [PATCH] --- yaml --- r: 165171 b: refs/heads/master c: e5b8fc6ac158f65598f58dba2c0d52ba3b412f52 h: refs/heads/master i: 165169: ac0a0c0e73f8b75aeff7ca5f63895b1888549986 165167: 36d71c6413b75615af996c76200c93eb6b2f9b11 v: v3 --- [refs] | 2 +- trunk/drivers/acpi/tables.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 802611c6e6e6..1e5e8caec237 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f4a2d5840e9f0e48d1a787b66e7346087a756029 +refs/heads/master: e5b8fc6ac158f65598f58dba2c0d52ba3b412f52 diff --git a/trunk/drivers/acpi/tables.c b/trunk/drivers/acpi/tables.c index 646d39c031ca..f336bca7c450 100644 --- a/trunk/drivers/acpi/tables.c +++ b/trunk/drivers/acpi/tables.c @@ -213,6 +213,9 @@ acpi_table_parse_entries(char *id, unsigned long table_end; acpi_size tbl_size; + if (acpi_disabled) + return -ENODEV; + if (!handler) return -EINVAL; @@ -277,6 +280,9 @@ int __init acpi_table_parse(char *id, acpi_table_handler handler) struct acpi_table_header *table = NULL; acpi_size tbl_size; + if (acpi_disabled) + return -ENODEV; + if (!handler) return -EINVAL;