Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...

[~andy/linux] / drivers / acpi / namespace / nsload.c

diff --git a/drivers/acpi/namespace/nsload.c b/drivers/acpi/namespace/nsload.c
index d4f9654fd20f315289d02af1cdb33bd335088e38..2c92f6cf5ce173c94a4a2aeaf64294e036089ded 100644 (file)
--- a/drivers/acpi/namespace/nsload.c
+++ b/drivers/acpi/namespace/nsload.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -107,11 +107,11 @@ acpi_ns_load_table(acpi_native_uint table_index,
                goto unlock;
        }
 
-       status = acpi_ns_parse_table(table_index, node->child);
+       status = acpi_ns_parse_table(table_index, node);
        if (ACPI_SUCCESS(status)) {
                acpi_tb_set_table_loaded_flag(table_index, TRUE);
        } else {
-               acpi_tb_release_owner_id(table_index);
+               (void)acpi_tb_release_owner_id(table_index);
        }
 
       unlock: