vserver 1.9.5.x5

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

diff --git a/drivers/acpi/dispatcher/dsopcode.c b/drivers/acpi/dispatcher/dsopcode.c
index e0a313f..66fc754 100644 (file)
--- a/drivers/acpi/dispatcher/dsopcode.c
+++ b/drivers/acpi/dispatcher/dsopcode.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2004, R. Byron Moore
+ * Copyright (C) 2000 - 2005, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -79,7 +79,6 @@ acpi_ds_execute_arguments (
        acpi_status                     status;
        union acpi_parse_object         *op;
        struct acpi_walk_state          *walk_state;
-       union acpi_parse_object         *arg;
 
 
        ACPI_FUNCTION_TRACE ("ds_execute_arguments");
@@ -105,7 +104,7 @@ acpi_ds_execute_arguments (
        }
 
        status = acpi_ds_init_aml_walk (walk_state, op, NULL, aml_start,
-                         aml_length, NULL, NULL, 1);
+                         aml_length, NULL, 1);
        if (ACPI_FAILURE (status)) {
                acpi_ds_delete_walk_state (walk_state);
                return_ACPI_STATUS (status);
@@ -126,9 +125,7 @@ acpi_ds_execute_arguments (
 
        /* Get and init the Op created above */
 
-       arg = op->common.value.arg;
        op->common.node = node;
-       arg->common.node = node;
        acpi_ps_delete_parse_tree (op);
 
        /* Evaluate the deferred arguments */
@@ -150,7 +147,7 @@ acpi_ds_execute_arguments (
        /* Execute the opcode and arguments */
 
        status = acpi_ds_init_aml_walk (walk_state, op, NULL, aml_start,
-                         aml_length, NULL, NULL, 3);
+                         aml_length, NULL, 3);
        if (ACPI_FAILURE (status)) {
                acpi_ds_delete_walk_state (walk_state);
                return_ACPI_STATUS (status);
@@ -765,9 +762,8 @@ acpi_ds_eval_region_operands (
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Get the operands and complete the following data objec types:
- *              Buffer
- *              Package
+ * DESCRIPTION: Get the operands and complete the following data object types:
+ *              Buffer, Package.
  *
  ****************************************************************************/