summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/tables.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-11 11:38:55 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-11 11:38:55 +0100
commit891393745aad5c5acdb01b6ce61c08d4cc064649 (patch)
tree7687b8b94c4bc4ec8d5f1106ff8ff4d557b2fabf /drivers/acpi/tables.c
parenta448720ca3248e8a7a426336885549d6e923fd8e (diff)
parent8e4921515c1a379539607eb443d51c30f4f7f338 (diff)
Merge commit 'v2.6.29-rc4' into x86/cleanups
Diffstat (limited to 'drivers/acpi/tables.c')
-rw-r--r--drivers/acpi/tables.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
index 775c97a282b..a8852952fac 100644
--- a/drivers/acpi/tables.c
+++ b/drivers/acpi/tables.c
@@ -293,7 +293,12 @@ static void __init check_multiple_madt(void)
int __init acpi_table_init(void)
{
- acpi_initialize_tables(initial_tables, ACPI_MAX_TABLES, 0);
+ acpi_status status;
+
+ status = acpi_initialize_tables(initial_tables, ACPI_MAX_TABLES, 0);
+ if (ACPI_FAILURE(status))
+ return 1;
+
check_multiple_madt();
return 0;
}