/home/lenb/src/to-akpm branch 'acpi-2.6.12'

1 files changed, 15 insertions, 2 deletions

diff --git a/drivers/acpi/tables/tbxface.c b/drivers/acpi/tables/tbxface.c
index 0c0b9085dbeb..e18a05d1b9b3 100644
--- a/drivers/acpi/tables/tbxface.c
+++ b/drivers/acpi/tables/tbxface.c
@@ -182,10 +182,23 @@ acpi_load_table (
                 return_ACPI_STATUS (status);
         }
 
+        /* Check signature for a valid table type */
+
+        status = acpi_tb_recognize_table (&table_info, ACPI_TABLE_ALL);
+        if (ACPI_FAILURE (status)) {
+                return_ACPI_STATUS (status);
+        }
+
         /* Install the new table into the local data structures */
 
         status = acpi_tb_install_table (&table_info);
         if (ACPI_FAILURE (status)) {
+                if (status == AE_ALREADY_EXISTS) {
+                        /* Table already exists, no error */
+
+                        status = AE_OK;
+                }
+
                 /* Free table allocated by acpi_tb_get_table_body */
 
                 acpi_tb_delete_single_table (&table_info);
@@ -260,8 +273,8 @@ acpi_unload_table (
                  * "Scope" operator.  Thus, we need to track ownership by an ID, not
                  * simply a position within the hierarchy
                  */
-                acpi_ns_delete_namespace_by_owner (table_desc->table_id);
-
+                acpi_ns_delete_namespace_by_owner (table_desc->owner_id);
+                acpi_ut_release_owner_id (&table_desc->owner_id);
                 table_desc = table_desc->next;
         }