4 files changed, 21 insertions, 14 deletions

diff --git a/drivers/acpi/executer/exconfig.c b/drivers/acpi/executer/exconfig.c
index 8bfa6effaa0c..76c6ebd0231f 100644
--- a/drivers/acpi/executer/exconfig.c
+++ b/drivers/acpi/executer/exconfig.c
@@ -487,7 +487,7 @@ acpi_ex_unload_table (
          * Delete the entire namespace under this table Node
          * (Offset contains the table_id)
          */
-        acpi_ns_delete_namespace_by_owner (table_info->table_id);
+        acpi_ns_delete_namespace_by_owner (table_info->owner_id);
 
         /* Delete the table itself */
 
diff --git a/drivers/acpi/executer/exdump.c b/drivers/acpi/executer/exdump.c
index 7007abb6051e..6158f5193f4a 100644
--- a/drivers/acpi/executer/exdump.c
+++ b/drivers/acpi/executer/exdump.c
@@ -819,7 +819,7 @@ acpi_ex_dump_object_descriptor (
                 acpi_ex_out_integer ("param_count", obj_desc->method.param_count);
                 acpi_ex_out_integer ("Concurrency", obj_desc->method.concurrency);
                 acpi_ex_out_pointer ("Semaphore",   obj_desc->method.semaphore);
-                acpi_ex_out_integer ("owning_id",   obj_desc->method.owning_id);
+                acpi_ex_out_integer ("owner_id",    obj_desc->method.owner_id);
                 acpi_ex_out_integer ("aml_length",  obj_desc->method.aml_length);
                 acpi_ex_out_pointer ("aml_start",   obj_desc->method.aml_start);
                 break;
diff --git a/drivers/acpi/executer/exoparg1.c b/drivers/acpi/executer/exoparg1.c
index 131f49acb1df..c1ba8b48228e 100644
--- a/drivers/acpi/executer/exoparg1.c
+++ b/drivers/acpi/executer/exoparg1.c
@@ -904,6 +904,7 @@ acpi_ex_opcode_1A_0T_1R (
                          */
                         return_desc = acpi_ns_get_attached_object (
                                           (struct acpi_namespace_node *) operand[0]);
+                        acpi_ut_add_reference (return_desc);
                 }
                 else {
                         /*
@@ -953,20 +954,10 @@ acpi_ex_opcode_1A_0T_1R (
                                          * add another reference to the referenced object, however.
                                          */
                                         return_desc = *(operand[0]->reference.where);
-                                        if (!return_desc) {
-                                                /*
-                                                 * We can't return a NULL dereferenced value.  This is
-                                                 * an uninitialized package element and is thus a
-                                                 * severe error.
-                                                 */
-                                                ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
-                                                        "NULL package element obj %p\n",
-                                                        operand[0]));
-                                                status = AE_AML_UNINITIALIZED_ELEMENT;
-                                                goto cleanup;
+                                        if (return_desc) {
+                            acpi_ut_add_reference (return_desc);
                                         }
 
-                                        acpi_ut_add_reference (return_desc);
                                         break;
 
 
diff --git a/drivers/acpi/executer/exresop.c b/drivers/acpi/executer/exresop.c
index d8b470eefe7a..aaba7abcb52d 100644
--- a/drivers/acpi/executer/exresop.c
+++ b/drivers/acpi/executer/exresop.c
@@ -426,6 +426,10 @@ acpi_ex_resolve_operands (
 
                                 return_ACPI_STATUS (status);
                         }
+
+                        if (obj_desc != *stack_ptr) {
+                                acpi_ut_remove_reference (obj_desc);
+                        }
                         goto next_operand;
 
 
@@ -448,6 +452,10 @@ acpi_ex_resolve_operands (
 
                                 return_ACPI_STATUS (status);
                         }
+
+                        if (obj_desc != *stack_ptr) {
+                                acpi_ut_remove_reference (obj_desc);
+                        }
                         goto next_operand;
 
 
@@ -471,6 +479,10 @@ acpi_ex_resolve_operands (
 
                                 return_ACPI_STATUS (status);
                         }
+
+                        if (obj_desc != *stack_ptr) {
+                                acpi_ut_remove_reference (obj_desc);
+                        }
                         goto next_operand;
 
 
@@ -515,6 +527,10 @@ acpi_ex_resolve_operands (
                                 if (ACPI_FAILURE (status)) {
                                         return_ACPI_STATUS (status);
                                 }
+
+                                if (obj_desc != *stack_ptr) {
+                                        acpi_ut_remove_reference (obj_desc);
+                                }
                                 break;
 
                         default: