This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / acpi / dispatcher / dswexec.c

diff --git a/drivers/acpi/dispatcher/dswexec.c b/drivers/acpi/dispatcher/dswexec.c
index 5619660..02872ca 100644 (file)
--- a/drivers/acpi/dispatcher/dswexec.c
+++ b/drivers/acpi/dispatcher/dswexec.c
@@ -60,18 +60,17 @@
  * Dispatch table for opcode classes
  */
 static ACPI_EXECUTE_OP      acpi_gbl_op_type_dispatch [] = {
-                         acpi_ex_opcode_0A_0T_1R,
-                         acpi_ex_opcode_1A_0T_0R,
-                         acpi_ex_opcode_1A_0T_1R,
-                         acpi_ex_opcode_1A_1T_0R,
-                         acpi_ex_opcode_1A_1T_1R,
-                         acpi_ex_opcode_2A_0T_0R,
-                         acpi_ex_opcode_2A_0T_1R,
-                         acpi_ex_opcode_2A_1T_1R,
-                         acpi_ex_opcode_2A_2T_1R,
-                         acpi_ex_opcode_3A_0T_0R,
-                         acpi_ex_opcode_3A_1T_1R,
-                         acpi_ex_opcode_6A_0T_1R};
+                        acpi_ex_opcode_1A_0T_0R,
+                        acpi_ex_opcode_1A_0T_1R,
+                        acpi_ex_opcode_1A_1T_0R,
+                        acpi_ex_opcode_1A_1T_1R,
+                        acpi_ex_opcode_2A_0T_0R,
+                        acpi_ex_opcode_2A_0T_1R,
+                        acpi_ex_opcode_2A_1T_1R,
+                        acpi_ex_opcode_2A_2T_1R,
+                        acpi_ex_opcode_3A_0T_0R,
+                        acpi_ex_opcode_3A_1T_1R,
+                        acpi_ex_opcode_6A_0T_1R};
 
 /*****************************************************************************
  *
@@ -414,7 +413,7 @@ acpi_ds_exec_end_op (
                         * routine.  There is one routine per opcode "type" based upon the
                         * number of opcode arguments and return type.
                         */
-                       status = acpi_gbl_op_type_dispatch[op_type] (walk_state);
+                       status = acpi_gbl_op_type_dispatch [op_type] (walk_state);
                }
                else {
                        /*
@@ -426,9 +425,7 @@ acpi_ds_exec_end_op (
                                (walk_state->operands[0]->common.type == ACPI_TYPE_LOCAL_REFERENCE) &&
                                (walk_state->operands[1]->common.type == ACPI_TYPE_LOCAL_REFERENCE) &&
                                (walk_state->operands[0]->reference.opcode ==
-                                walk_state->operands[1]->reference.opcode) &&
-                               (walk_state->operands[0]->reference.offset ==
-                                walk_state->operands[1]->reference.offset)) {
+                                walk_state->operands[1]->reference.opcode)) {
                                status = AE_OK;
                        }
                        else {
@@ -642,8 +639,7 @@ acpi_ds_exec_end_op (
         * conditional predicate
         */
 
-       if ((ACPI_SUCCESS (status)) &&
-               (walk_state->control_state) &&
+       if ((walk_state->control_state) &&
                (walk_state->control_state->common.state ==
                        ACPI_CONTROL_PREDICATE_EXECUTING) &&
                (walk_state->control_state->control.predicate_op == op)) {
@@ -653,19 +649,6 @@ acpi_ds_exec_end_op (
 
 
 cleanup:
-
-       /* Invoke exception handler on error */
-
-       if (ACPI_FAILURE (status) &&
-               acpi_gbl_exception_handler &&
-               !(status & AE_CODE_CONTROL)) {
-               acpi_ex_exit_interpreter ();
-               status = acpi_gbl_exception_handler (status,
-                                walk_state->method_node->name.integer, walk_state->opcode,
-                                walk_state->aml_offset, NULL);
-               acpi_ex_enter_interpreter ();
-       }
-
        if (walk_state->result_obj) {
                /* Break to debugger to display result */