git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
ACPI: check acpi_disabled in acpi_table_parse() and acpi_table_parse_entries()
[pandora-kernel.git]
/
drivers
/
acpi
/
tables.c
diff --git
a/drivers/acpi/tables.c
b/drivers/acpi/tables.c
index
646d39c
..
f336bca
100644
(file)
--- a/
drivers/acpi/tables.c
+++ b/
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;