diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-18 13:49:29 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-18 13:49:29 +0100 |
| commit | a090b22f3fafa9340f903834de87552b50c5f2ba (patch) | |
| tree | d07b55c9d60d585f8ceed2c8f43e8a04309fc67e /drivers/acpi/acpica/dsmethod.c | |
| parent | Merge branch 'acpi-scan' into acpi-lpss (diff) | |
| parent | ACPICA: Cleanup table handler naming conflicts. (diff) | |
| download | linux-a090b22f3fafa9340f903834de87552b50c5f2ba.tar.xz linux-a090b22f3fafa9340f903834de87552b50c5f2ba.zip | |
Merge branch 'acpica' into acpi-lpss
The following commits depend on the 'acpica' material.
Diffstat (limited to 'drivers/acpi/acpica/dsmethod.c')
| -rw-r--r-- | drivers/acpi/acpica/dsmethod.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/acpi/acpica/dsmethod.c b/drivers/acpi/acpica/dsmethod.c index 52eb4e01622a..4e5873ab4f01 100644 --- a/drivers/acpi/acpica/dsmethod.c +++ b/drivers/acpi/acpica/dsmethod.c @@ -47,7 +47,7 @@ #include "acinterp.h" #include "acnamesp.h" #ifdef ACPI_DISASSEMBLER -#include <acpi/acdisasm.h> +#include "acdisasm.h" #endif #define _COMPONENT ACPI_DISPATCHER @@ -151,6 +151,7 @@ acpi_ds_create_method_mutex(union acpi_operand_object *method_desc) status = acpi_os_create_mutex(&mutex_desc->mutex.os_mutex); if (ACPI_FAILURE(status)) { + acpi_ut_delete_object_desc(mutex_desc); return_ACPI_STATUS(status); } @@ -378,7 +379,8 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread, */ info = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_evaluate_info)); if (!info) { - return_ACPI_STATUS(AE_NO_MEMORY); + status = AE_NO_MEMORY; + goto cleanup; } info->parameters = &this_walk_state->operands[0]; |