1 files changed, 11 insertions, 18 deletions

diff --git a/drivers/acpi/executer/exoparg1.c b/drivers/acpi/executer/exoparg1.c
index dbdf8262ba00..48c30f800083 100644
--- a/drivers/acpi/executer/exoparg1.c
+++ b/drivers/acpi/executer/exoparg1.c
@@ -113,8 +113,9 @@ acpi_ex_opcode_0A_0T_1R (
                         status = AE_NO_MEMORY;
                         goto cleanup;
                 }
-
+#if ACPI_MACHINE_WIDTH != 16
                 return_desc->integer.value = acpi_os_get_timer ();
+#endif
                 break;
 
         default:                /*  Unknown opcode  */
@@ -127,15 +128,16 @@ acpi_ex_opcode_0A_0T_1R (
 
 cleanup:
 
-        if (!walk_state->result_obj) {
-                walk_state->result_obj = return_desc;
-        }
-
         /* Delete return object on error */
 
-        if (ACPI_FAILURE (status)) {
+        if ((ACPI_FAILURE (status)) || walk_state->result_obj) {
                 acpi_ut_remove_reference (return_desc);
         }
+        else {
+                /* Save the return value */
+
+                walk_state->result_obj = return_desc;
+        }
 
         return_ACPI_STATUS (status);
 }
@@ -902,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 {
                         /*
@@ -951,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;