aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/parser
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/acpi/parser')
-rw-r--r--drivers/acpi/parser/psparse.c23
-rw-r--r--drivers/acpi/parser/psxface.c14
2 files changed, 9 insertions, 28 deletions
diff --git a/drivers/acpi/parser/psparse.c b/drivers/acpi/parser/psparse.c
index 3248051d77ee..76d4d640d83c 100644
--- a/drivers/acpi/parser/psparse.c
+++ b/drivers/acpi/parser/psparse.c
@@ -438,7 +438,6 @@ acpi_ps_next_parse_state(struct acpi_walk_state *walk_state,
438acpi_status acpi_ps_parse_aml(struct acpi_walk_state *walk_state) 438acpi_status acpi_ps_parse_aml(struct acpi_walk_state *walk_state)
439{ 439{
440 acpi_status status; 440 acpi_status status;
441 acpi_status terminate_status;
442 struct acpi_thread_state *thread; 441 struct acpi_thread_state *thread;
443 struct acpi_thread_state *prev_walk_list = acpi_gbl_current_walk_list; 442 struct acpi_thread_state *prev_walk_list = acpi_gbl_current_walk_list;
444 struct acpi_walk_state *previous_walk_state; 443 struct acpi_walk_state *previous_walk_state;
@@ -508,6 +507,10 @@ acpi_status acpi_ps_parse_aml(struct acpi_walk_state *walk_state)
508 walk_state->method_node, NULL, 507 walk_state->method_node, NULL,
509 status); 508 status);
510 509
510 /* Ensure proper cleanup */
511
512 walk_state->parse_flags |= ACPI_PARSE_EXECUTE;
513
511 /* Check for possible multi-thread reentrancy problem */ 514 /* Check for possible multi-thread reentrancy problem */
512 515
513 if ((status == AE_ALREADY_EXISTS) && 516 if ((status == AE_ALREADY_EXISTS) &&
@@ -524,14 +527,6 @@ acpi_status acpi_ps_parse_aml(struct acpi_walk_state *walk_state)
524 } 527 }
525 } 528 }
526 529
527 if (walk_state->method_desc) {
528 /* Decrement the thread count on the method parse tree */
529
530 if (walk_state->method_desc->method.thread_count) {
531 walk_state->method_desc->method.thread_count--;
532 }
533 }
534
535 /* We are done with this walk, move on to the parent if any */ 530 /* We are done with this walk, move on to the parent if any */
536 531
537 walk_state = acpi_ds_pop_walk_state(thread); 532 walk_state = acpi_ds_pop_walk_state(thread);
@@ -546,13 +541,13 @@ acpi_status acpi_ps_parse_aml(struct acpi_walk_state *walk_state)
546 */ 541 */
547 if ((walk_state->parse_flags & ACPI_PARSE_MODE_MASK) == 542 if ((walk_state->parse_flags & ACPI_PARSE_MODE_MASK) ==
548 ACPI_PARSE_EXECUTE) { 543 ACPI_PARSE_EXECUTE) {
549 terminate_status = 544 if (walk_state->method_desc) {
550 acpi_ds_terminate_control_method(walk_state); 545 /* Decrement the thread count on the method parse tree */
551 if (ACPI_FAILURE(terminate_status)) {
552 ACPI_REPORT_ERROR(("Could not terminate control method properly\n"));
553 546
554 /* Ignore error and continue */ 547 walk_state->method_desc->method.thread_count--;
555 } 548 }
549
550 acpi_ds_terminate_control_method(walk_state);
556 } 551 }
557 552
558 /* Delete this walk state and all linked control states */ 553 /* Delete this walk state and all linked control states */
diff --git a/drivers/acpi/parser/psxface.c b/drivers/acpi/parser/psxface.c
index 80c67f2d3dd2..4dcbd443160e 100644
--- a/drivers/acpi/parser/psxface.c
+++ b/drivers/acpi/parser/psxface.c
@@ -99,16 +99,6 @@ acpi_status acpi_ps_execute_method(struct acpi_parameter_info *info)
99 } 99 }
100 100
101 /* 101 /*
102 * Get a new owner_id for objects created by this method. Namespace
103 * objects (such as Operation Regions) can be created during the
104 * first pass parse.
105 */
106 status = acpi_ut_allocate_owner_id(&info->obj_desc->method.owner_id);
107 if (ACPI_FAILURE(status)) {
108 return_ACPI_STATUS(status);
109 }
110
111 /*
112 * The caller "owns" the parameters, so give each one an extra 102 * The caller "owns" the parameters, so give each one an extra
113 * reference 103 * reference
114 */ 104 */
@@ -139,10 +129,6 @@ acpi_status acpi_ps_execute_method(struct acpi_parameter_info *info)
139 status = acpi_ps_execute_pass(info); 129 status = acpi_ps_execute_pass(info);
140 130
141 cleanup: 131 cleanup:
142 if (info->obj_desc->method.owner_id) {
143 acpi_ut_release_owner_id(&info->obj_desc->method.owner_id);
144 }
145
146 /* Take away the extra reference that we gave the parameters above */ 132 /* Take away the extra reference that we gave the parameters above */
147 133
148 acpi_ps_update_parameter_list(info, REF_DECREMENT); 134 acpi_ps_update_parameter_list(info, REF_DECREMENT);