diff options
author | Len Brown <len.brown@intel.com> | 2009-09-19 00:37:13 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-09-19 00:37:13 -0400 |
commit | 003d6a38ce1a59e0053a02fd9e9a65b588bc8e33 (patch) | |
tree | c9b941f4798a2accca200b0b01c07353ce5b07e1 /drivers/acpi/tables.c | |
parent | 71fd68e7d234f6b7d8407c8f486764d24f8411f4 (diff) | |
parent | e55a5999ffcf72dc4d43d73618957964cb87065a (diff) |
Merge branch 'sfi-base' into release
Conflicts:
drivers/acpi/power.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/tables.c')
-rw-r--r-- | drivers/acpi/tables.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c index 646d39c031c..f336bca7c45 100644 --- 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; |