diff options
Diffstat (limited to 'drivers/acpi/parser/psparse.c')
-rw-r--r-- | drivers/acpi/parser/psparse.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/acpi/parser/psparse.c b/drivers/acpi/parser/psparse.c index a9f3229f410..83d8916bc1a 100644 --- a/drivers/acpi/parser/psparse.c +++ b/drivers/acpi/parser/psparse.c | |||
@@ -106,6 +106,7 @@ u16 acpi_ps_peek_opcode(struct acpi_parse_state * parser_state) | |||
106 | opcode = (u16) ACPI_GET8(aml); | 106 | opcode = (u16) ACPI_GET8(aml); |
107 | 107 | ||
108 | if (opcode == AML_EXTENDED_OP_PREFIX) { | 108 | if (opcode == AML_EXTENDED_OP_PREFIX) { |
109 | |||
109 | /* Extended opcode, get the second opcode byte */ | 110 | /* Extended opcode, get the second opcode byte */ |
110 | 111 | ||
111 | aml++; | 112 | aml++; |
@@ -158,6 +159,7 @@ acpi_ps_complete_this_op(struct acpi_walk_state * walk_state, | |||
158 | if (op->common.parent) { | 159 | if (op->common.parent) { |
159 | prev = op->common.parent->common.value.arg; | 160 | prev = op->common.parent->common.value.arg; |
160 | if (!prev) { | 161 | if (!prev) { |
162 | |||
161 | /* Nothing more to do */ | 163 | /* Nothing more to do */ |
162 | 164 | ||
163 | goto cleanup; | 165 | goto cleanup; |
@@ -245,6 +247,7 @@ acpi_ps_complete_this_op(struct acpi_walk_state * walk_state, | |||
245 | /* We must unlink this op from the parent tree */ | 247 | /* We must unlink this op from the parent tree */ |
246 | 248 | ||
247 | if (prev == op) { | 249 | if (prev == op) { |
250 | |||
248 | /* This op is the first in the list */ | 251 | /* This op is the first in the list */ |
249 | 252 | ||
250 | if (replacement_op) { | 253 | if (replacement_op) { |
@@ -265,6 +268,7 @@ acpi_ps_complete_this_op(struct acpi_walk_state * walk_state, | |||
265 | 268 | ||
266 | else | 269 | else |
267 | while (prev) { | 270 | while (prev) { |
271 | |||
268 | /* Traverse all siblings in the parent's argument list */ | 272 | /* Traverse all siblings in the parent's argument list */ |
269 | 273 | ||
270 | next = prev->common.next; | 274 | next = prev->common.next; |
@@ -510,6 +514,7 @@ acpi_status acpi_ps_parse_aml(struct acpi_walk_state *walk_state) | |||
510 | } else if (status == AE_CTRL_TERMINATE) { | 514 | } else if (status == AE_CTRL_TERMINATE) { |
511 | status = AE_OK; | 515 | status = AE_OK; |
512 | } else if ((status != AE_OK) && (walk_state->method_desc)) { | 516 | } else if ((status != AE_OK) && (walk_state->method_desc)) { |
517 | |||
513 | /* Either the method parse or actual execution failed */ | 518 | /* Either the method parse or actual execution failed */ |
514 | 519 | ||
515 | ACPI_ERROR_METHOD("Method parse/execution failed", | 520 | ACPI_ERROR_METHOD("Method parse/execution failed", |
@@ -551,6 +556,7 @@ acpi_status acpi_ps_parse_aml(struct acpi_walk_state *walk_state) | |||
551 | if (((walk_state->parse_flags & ACPI_PARSE_MODE_MASK) == | 556 | if (((walk_state->parse_flags & ACPI_PARSE_MODE_MASK) == |
552 | ACPI_PARSE_EXECUTE) || (ACPI_FAILURE(status))) { | 557 | ACPI_PARSE_EXECUTE) || (ACPI_FAILURE(status))) { |
553 | if (walk_state->method_desc) { | 558 | if (walk_state->method_desc) { |
559 | |||
554 | /* Decrement the thread count on the method parse tree */ | 560 | /* Decrement the thread count on the method parse tree */ |
555 | 561 | ||
556 | if (walk_state->method_desc->method. | 562 | if (walk_state->method_desc->method. |
@@ -633,12 +639,14 @@ acpi_status acpi_ps_parse_aml(struct acpi_walk_state *walk_state) | |||
633 | } | 639 | } |
634 | } else { | 640 | } else { |
635 | if (previous_walk_state->return_desc) { | 641 | if (previous_walk_state->return_desc) { |
642 | |||
636 | /* Caller doesn't want it, must delete it */ | 643 | /* Caller doesn't want it, must delete it */ |
637 | 644 | ||
638 | acpi_ut_remove_reference(previous_walk_state-> | 645 | acpi_ut_remove_reference(previous_walk_state-> |
639 | return_desc); | 646 | return_desc); |
640 | } | 647 | } |
641 | if (previous_walk_state->implicit_return_obj) { | 648 | if (previous_walk_state->implicit_return_obj) { |
649 | |||
642 | /* Caller doesn't want it, must delete it */ | 650 | /* Caller doesn't want it, must delete it */ |
643 | 651 | ||
644 | acpi_ut_remove_reference(previous_walk_state-> | 652 | acpi_ut_remove_reference(previous_walk_state-> |