ACPICA: Cosmetic changes only, no functional changes

[linux-2.6] / drivers / acpi / executer / exresolv.c

diff --git a/drivers/acpi/executer/exresolv.c b/drivers/acpi/executer/exresolv.c
index 6499de8780173f44e19a41ef7bf2ac9fb30d9531..74ab220a5924b47fb6cb97f3c28a3c775700e206 100644 (file)
--- a/drivers/acpi/executer/exresolv.c
+++ b/drivers/acpi/executer/exresolv.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -140,8 +140,7 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
 {
        acpi_status status = AE_OK;
        union acpi_operand_object *stack_desc;
-       void *temp_node;
-       union acpi_operand_object *obj_desc;
+       union acpi_operand_object *obj_desc = NULL;
        u16 opcode;
 
        ACPI_FUNCTION_TRACE(ex_resolve_object_to_value);
@@ -156,23 +155,6 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
                opcode = stack_desc->reference.opcode;
 
                switch (opcode) {
-               case AML_NAME_OP:
-
-                       /*
-                        * Convert name reference to a namespace node
-                        * Then, acpi_ex_resolve_node_to_value can be used to get the value
-                        */
-                       temp_node = stack_desc->reference.object;
-
-                       /* Delete the Reference Object */
-
-                       acpi_ut_remove_reference(stack_desc);
-
-                       /* Return the namespace node */
-
-                       (*stack_ptr) = temp_node;
-                       break;
-
                case AML_LOCAL_OP:
                case AML_ARG_OP:
 
@@ -299,8 +281,6 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
                status = acpi_ds_get_package_arguments(stack_desc);
                break;
 
-               /* These cases may never happen here, but just in case.. */
-
        case ACPI_TYPE_BUFFER_FIELD:
        case ACPI_TYPE_LOCAL_REGION_FIELD:
        case ACPI_TYPE_LOCAL_BANK_FIELD:
@@ -314,6 +294,10 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
                status =
                    acpi_ex_read_data_from_field(walk_state, stack_desc,
                                                 &obj_desc);
+
+               /* Remove a reference to the original operand, then override */
+
+               acpi_ut_remove_reference(*stack_ptr);
                *stack_ptr = (void *)obj_desc;
                break;