diff options
| author | Bob Moore <robert.moore@intel.com> | 2008-04-10 17:06:40 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-04-22 20:29:27 +0200 |
| commit | 1d18c05825c3f2b8933a7fc7f7528881e98deb04 (patch) | |
| tree | 8b0a1ed08c4281451899d28785b936369b77b91d /drivers/acpi/namespace/nsparse.c | |
| parent | ACPICA: Update version to 20071019 (diff) | |
| download | linux-1d18c05825c3f2b8933a7fc7f7528881e98deb04.tar.xz linux-1d18c05825c3f2b8933a7fc7f7528881e98deb04.zip | |
ACPICA: Cosmetic changes only, no functional changes
Lint changes, fix compiler warnings, etc.
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/namespace/nsparse.c')
| -rw-r--r-- | drivers/acpi/namespace/nsparse.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/drivers/acpi/namespace/nsparse.c b/drivers/acpi/namespace/nsparse.c index 86bd6e5920c7..f260b6941c13 100644 --- a/drivers/acpi/namespace/nsparse.c +++ b/drivers/acpi/namespace/nsparse.c @@ -112,21 +112,25 @@ acpi_ns_one_complete_parse(acpi_native_uint pass_number, aml_start = (u8 *) table + sizeof(struct acpi_table_header); aml_length = table->length - sizeof(struct acpi_table_header); status = acpi_ds_init_aml_walk(walk_state, parse_root, NULL, - aml_start, aml_length, NULL, - (u8) pass_number); + aml_start, (u32) aml_length, + NULL, (u8) pass_number); } if (ACPI_FAILURE(status)) { acpi_ds_delete_walk_state(walk_state); - acpi_ps_delete_parse_tree(parse_root); - return_ACPI_STATUS(status); + goto cleanup; } /* start_node is the default location to load the table */ if (start_node && start_node != acpi_gbl_root_node) { - acpi_ds_scope_stack_push(start_node, ACPI_TYPE_METHOD, - walk_state); + status = + acpi_ds_scope_stack_push(start_node, ACPI_TYPE_METHOD, + walk_state); + if (ACPI_FAILURE(status)) { + acpi_ds_delete_walk_state(walk_state); + goto cleanup; + } } /* Parse the AML */ @@ -135,6 +139,7 @@ acpi_ns_one_complete_parse(acpi_native_uint pass_number, (unsigned)pass_number)); status = acpi_ps_parse_aml(walk_state); + cleanup: acpi_ps_delete_parse_tree(parse_root); return_ACPI_STATUS(status); } |