ACPICA: Several fixes for internal method result stack

fixes STACK_OVERFLOW exception on nested method calls. internal
bugzilla 262 and 275.

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>

2 files changed, 3 insertions, 23 deletions

diff --git a/drivers/acpi/parser/psloop.c b/drivers/acpi/parser/psloop.c
index 773aee82fbb8..266dd0c10218 100644
--- a/drivers/acpi/parser/psloop.c
+++ b/drivers/acpi/parser/psloop.c
@@ -603,13 +603,6 @@ acpi_ps_complete_op(struct acpi_walk_state *walk_state,
                         acpi_ps_pop_scope(&(walk_state->parser_state), op,
                                           &walk_state->arg_types,
                                           &walk_state->arg_count);
-
-                        if ((*op)->common.aml_opcode != AML_WHILE_OP) {
-                                status2 = acpi_ds_result_stack_pop(walk_state);
-                                if (ACPI_FAILURE(status2)) {
-                                        return_ACPI_STATUS(status2);
-                                }
-                        }
                 }
 
                 /* Close this iteration of the While loop */
@@ -640,10 +633,6 @@ acpi_ps_complete_op(struct acpi_walk_state *walk_state,
                                 if (ACPI_FAILURE(status2)) {
                                         return_ACPI_STATUS(status2);
                                 }
-                                status2 = acpi_ds_result_stack_pop(walk_state);
-                                if (ACPI_FAILURE(status2)) {
-                                        return_ACPI_STATUS(status2);
-                                }
 
                                 acpi_ut_delete_generic_state
                                     (acpi_ut_pop_generic_state
diff --git a/drivers/acpi/parser/psparse.c b/drivers/acpi/parser/psparse.c
index 5d63f48e56b5..ce3139a74f95 100644
--- a/drivers/acpi/parser/psparse.c
+++ b/drivers/acpi/parser/psparse.c
@@ -349,19 +349,13 @@ acpi_ps_next_parse_state(struct acpi_walk_state *walk_state,
 
                 parser_state->aml = walk_state->aml_last_while;
                 walk_state->control_state->common.value = FALSE;
-                status = acpi_ds_result_stack_pop(walk_state);
-                if (ACPI_SUCCESS(status)) {
-                        status = AE_CTRL_BREAK;
-                }
+                status = AE_CTRL_BREAK;
                 break;
 
         case AE_CTRL_CONTINUE:
 
                 parser_state->aml = walk_state->aml_last_while;
-                status = acpi_ds_result_stack_pop(walk_state);
-                if (ACPI_SUCCESS(status)) {
-                        status = AE_CTRL_CONTINUE;
-                }
+                status = AE_CTRL_CONTINUE;
                 break;
 
         case AE_CTRL_PENDING:
@@ -383,10 +377,7 @@ acpi_ps_next_parse_state(struct acpi_walk_state *walk_state,
                  * Just close out this package
                  */
                 parser_state->aml = acpi_ps_get_next_package_end(parser_state);
-                status = acpi_ds_result_stack_pop(walk_state);
-                if (ACPI_SUCCESS(status)) {
-                        status = AE_CTRL_PENDING;
-                }
+                status = AE_CTRL_PENDING;
                 break;
 
         case AE_CTRL_FALSE: