diff options
| author | Len Brown <len.brown@intel.com> | 2005-08-04 18:09:09 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-08-04 18:09:09 -0400 |
| commit | 5d2a22079c825669d91a3a200332f1053b4b61b0 (patch) | |
| tree | 2e6e88bbcc3e17535fdf3103540b246b3658e20b /drivers/acpi/dispatcher/dsopcode.c | |
| parent | 1c5ad84516ae7ea4ec868436a910a6bd8d20215a (diff) | |
| parent | bd6dbdf3c7b9784fbf5d8500e427a954e27a976a (diff) | |
| download | op-kernel-dev-5d2a22079c825669d91a3a200332f1053b4b61b0.zip op-kernel-dev-5d2a22079c825669d91a3a200332f1053b4b61b0.tar.gz | |
/home/lenb/src/to-akpm branch 'acpi-2.6.12'
Diffstat (limited to 'drivers/acpi/dispatcher/dsopcode.c')
| -rw-r--r-- | drivers/acpi/dispatcher/dsopcode.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/acpi/dispatcher/dsopcode.c b/drivers/acpi/dispatcher/dsopcode.c index ba13bca..750bdb1 100644 --- a/drivers/acpi/dispatcher/dsopcode.c +++ b/drivers/acpi/dispatcher/dsopcode.c @@ -119,14 +119,15 @@ acpi_ds_execute_arguments ( walk_state = acpi_ds_create_walk_state (0, NULL, NULL, NULL); if (!walk_state) { - return_ACPI_STATUS (AE_NO_MEMORY); + status = AE_NO_MEMORY; + goto cleanup; } status = acpi_ds_init_aml_walk (walk_state, op, NULL, aml_start, aml_length, NULL, 1); if (ACPI_FAILURE (status)) { acpi_ds_delete_walk_state (walk_state); - return_ACPI_STATUS (status); + goto cleanup; } /* Mark this parse as a deferred opcode */ @@ -138,8 +139,7 @@ acpi_ds_execute_arguments ( status = acpi_ps_parse_aml (walk_state); if (ACPI_FAILURE (status)) { - acpi_ps_delete_parse_tree (op); - return_ACPI_STATUS (status); + goto cleanup; } /* Get and init the Op created above */ @@ -160,7 +160,8 @@ acpi_ds_execute_arguments ( walk_state = acpi_ds_create_walk_state (0, NULL, NULL, NULL); if (!walk_state) { - return_ACPI_STATUS (AE_NO_MEMORY); + status = AE_NO_MEMORY; + goto cleanup; } /* Execute the opcode and arguments */ @@ -169,13 +170,15 @@ acpi_ds_execute_arguments ( aml_length, NULL, 3); if (ACPI_FAILURE (status)) { acpi_ds_delete_walk_state (walk_state); - return_ACPI_STATUS (status); + goto cleanup; } /* Mark this execution as a deferred opcode */ walk_state->deferred_node = node; status = acpi_ps_parse_aml (walk_state); + +cleanup: acpi_ps_delete_parse_tree (op); return_ACPI_STATUS (status); } |
