diff options
Diffstat (limited to 'drivers/acpi/dispatcher/dsmethod.c')
-rw-r--r-- | drivers/acpi/dispatcher/dsmethod.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/acpi/dispatcher/dsmethod.c b/drivers/acpi/dispatcher/dsmethod.c index c475546535b6..238916ce5412 100644 --- a/drivers/acpi/dispatcher/dsmethod.c +++ b/drivers/acpi/dispatcher/dsmethod.c | |||
@@ -81,6 +81,7 @@ acpi_ds_method_error(acpi_status status, struct acpi_walk_state *walk_state) | |||
81 | /* Invoke the global exception handler */ | 81 | /* Invoke the global exception handler */ |
82 | 82 | ||
83 | if (acpi_gbl_exception_handler) { | 83 | if (acpi_gbl_exception_handler) { |
84 | |||
84 | /* Exit the interpreter, allow handler to execute methods */ | 85 | /* Exit the interpreter, allow handler to execute methods */ |
85 | 86 | ||
86 | acpi_ex_exit_interpreter(); | 87 | acpi_ex_exit_interpreter(); |
@@ -100,6 +101,7 @@ acpi_ds_method_error(acpi_status status, struct acpi_walk_state *walk_state) | |||
100 | } | 101 | } |
101 | #ifdef ACPI_DISASSEMBLER | 102 | #ifdef ACPI_DISASSEMBLER |
102 | if (ACPI_FAILURE(status)) { | 103 | if (ACPI_FAILURE(status)) { |
104 | |||
103 | /* Display method locals/args if disassembler is present */ | 105 | /* Display method locals/args if disassembler is present */ |
104 | 106 | ||
105 | acpi_dm_dump_method_info(status, walk_state, walk_state->op); | 107 | acpi_dm_dump_method_info(status, walk_state, walk_state->op); |
@@ -249,6 +251,7 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread, | |||
249 | } | 251 | } |
250 | 252 | ||
251 | if (!(obj_desc->method.method_flags & AML_METHOD_INTERNAL_ONLY)) { | 253 | if (!(obj_desc->method.method_flags & AML_METHOD_INTERNAL_ONLY)) { |
254 | |||
252 | /* 1) Parse: Create a new walk state for the preempting walk */ | 255 | /* 1) Parse: Create a new walk state for the preempting walk */ |
253 | 256 | ||
254 | next_walk_state = | 257 | next_walk_state = |
@@ -378,9 +381,11 @@ acpi_ds_restart_control_method(struct acpi_walk_state *walk_state, | |||
378 | /* Did the called method return a value? */ | 381 | /* Did the called method return a value? */ |
379 | 382 | ||
380 | if (return_desc) { | 383 | if (return_desc) { |
384 | |||
381 | /* Are we actually going to use the return value? */ | 385 | /* Are we actually going to use the return value? */ |
382 | 386 | ||
383 | if (walk_state->return_used) { | 387 | if (walk_state->return_used) { |
388 | |||
384 | /* Save the return value from the previous method */ | 389 | /* Save the return value from the previous method */ |
385 | 390 | ||
386 | status = acpi_ds_result_push(return_desc, walk_state); | 391 | status = acpi_ds_result_push(return_desc, walk_state); |