3 files changed, 16 insertions, 7 deletions

diff --git a/drivers/acpi/executer/exconfig.c b/drivers/acpi/executer/exconfig.c
index 76c6ebd0231f..d11e9ec827f1 100644
--- a/drivers/acpi/executer/exconfig.c
+++ b/drivers/acpi/executer/exconfig.c
@@ -99,6 +99,11 @@ acpi_ex_add_table (
                 return_ACPI_STATUS (AE_NO_MEMORY);
         }
 
+        /* Init the table handle */
+
+        obj_desc->reference.opcode = AML_LOAD_OP;
+        *ddb_handle = obj_desc;
+
         /* Install the new table into the local data structures */
 
         ACPI_MEMSET (&table_info, 0, sizeof (struct acpi_table_desc));
@@ -109,7 +114,14 @@ acpi_ex_add_table (
         table_info.allocation = ACPI_MEM_ALLOCATED;
 
         status = acpi_tb_install_table (&table_info);
+        obj_desc->reference.object = table_info.installed_desc;
+
         if (ACPI_FAILURE (status)) {
+                if (status == AE_ALREADY_EXISTS) {
+                        /* Table already exists, just return the handle */
+
+                        return_ACPI_STATUS (AE_OK);
+                }
                 goto cleanup;
         }
 
@@ -123,16 +135,12 @@ acpi_ex_add_table (
                 goto cleanup;
         }
 
-        /* Init the table handle */
-
-        obj_desc->reference.opcode = AML_LOAD_OP;
-        obj_desc->reference.object = table_info.installed_desc;
-        *ddb_handle = obj_desc;
         return_ACPI_STATUS (AE_OK);
 
 
 cleanup:
         acpi_ut_remove_reference (obj_desc);
+        *ddb_handle = NULL;
         return_ACPI_STATUS (status);
 }
 
@@ -488,6 +496,7 @@ acpi_ex_unload_table (
          * (Offset contains the table_id)
          */
         acpi_ns_delete_namespace_by_owner (table_info->owner_id);
+        acpi_ut_release_owner_id (&table_info->owner_id);
 
         /* Delete the table itself */
 
diff --git a/drivers/acpi/executer/exdump.c b/drivers/acpi/executer/exdump.c
index fd13cc3db018..4f98dceed39a 100644
--- a/drivers/acpi/executer/exdump.c
+++ b/drivers/acpi/executer/exdump.c
@@ -598,7 +598,7 @@ acpi_ex_dump_reference (
                         acpi_os_printf ("Could not convert name to pathname\n");
                 }
                 else {
-                   acpi_os_printf ("%s\n", ret_buf.pointer);
+                   acpi_os_printf ("%s\n", (char *) ret_buf.pointer);
                    ACPI_MEM_FREE (ret_buf.pointer);
                 }
         }
diff --git a/drivers/acpi/executer/exoparg1.c b/drivers/acpi/executer/exoparg1.c
index c1ba8b48228e..48c30f800083 100644
--- a/drivers/acpi/executer/exoparg1.c
+++ b/drivers/acpi/executer/exoparg1.c
@@ -955,7 +955,7 @@ acpi_ex_opcode_1A_0T_1R (
                                          */
                                         return_desc = *(operand[0]->reference.where);
                                         if (return_desc) {
-                            acpi_ut_add_reference (return_desc);
+                                                acpi_ut_add_reference (return_desc);
                                         }
 
                                         break;