diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-29 19:55:27 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-29 19:55:27 -0400 |
| commit | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (patch) | |
| tree | ebe1629ecbf3182eeb3383744a98b2d900687721 /drivers/acpi/dispatcher/dswexec.c | |
| parent | f1b2ad5d2a8e1791d806ef244164d19c3d5c8b83 (diff) | |
| parent | 967440e3be1af06ad4dc7bb18d2e3c16130fe067 (diff) | |
| download | linux-next-9dce0e950dbfab4148f35ac6f297d8638cdc63c4.tar.gz | |
Pull acpica into release branch
Diffstat (limited to 'drivers/acpi/dispatcher/dswexec.c')
| -rw-r--r-- | drivers/acpi/dispatcher/dswexec.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/acpi/dispatcher/dswexec.c b/drivers/acpi/dispatcher/dswexec.c index 3acbd9145d72..b1ded62d0df1 100644 --- a/drivers/acpi/dispatcher/dswexec.c +++ b/drivers/acpi/dispatcher/dswexec.c @@ -472,7 +472,6 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state) acpi_ds_result_push(walk_state->result_obj, walk_state); } - break; default: @@ -510,6 +509,7 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state) ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, "Method Reference in a Package, Op=%p\n", op)); + op->common.node = (struct acpi_namespace_node *)op->asl.value. arg->asl.node->object; @@ -670,7 +670,6 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state) status = acpi_ds_result_stack_pop(walk_state); } - break; case AML_TYPE_UNDEFINED: @@ -708,7 +707,6 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state) * Check if we just completed the evaluation of a * conditional predicate */ - if ((ACPI_SUCCESS(status)) && (walk_state->control_state) && (walk_state->control_state->common.state == |