Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

[cascardo/linux.git] / drivers / acpi / acpica / psloop.c

diff --git a/drivers/acpi/acpica/psloop.c b/drivers/acpi/acpica/psloop.c
index 03ac8c9..a57f473 100644 (file)
--- a/drivers/acpi/acpica/psloop.c
+++ b/drivers/acpi/acpica/psloop.c
@@ -109,10 +109,10 @@ acpi_ps_get_arguments(struct acpi_walk_state *walk_state,
 
        case AML_INT_NAMEPATH_OP:       /* AML_NAMESTRING_ARG */
 
-               status =
-                   acpi_ps_get_next_namepath(walk_state,
-                                             &(walk_state->parser_state), op,
-                                             1);
+               status = acpi_ps_get_next_namepath(walk_state,
+                                                  &(walk_state->parser_state),
+                                                  op,
+                                                  ACPI_POSSIBLE_METHOD_CALL);
                if (ACPI_FAILURE(status)) {
                        return_ACPI_STATUS(status);
                }
@@ -124,8 +124,8 @@ acpi_ps_get_arguments(struct acpi_walk_state *walk_state,
                /*
                 * Op is not a constant or string, append each argument to the Op
                 */
-               while (GET_CURRENT_ARG_TYPE(walk_state->arg_types)
-                      && !walk_state->arg_count) {
+               while (GET_CURRENT_ARG_TYPE(walk_state->arg_types) &&
+                      !walk_state->arg_count) {
                        walk_state->aml = walk_state->parser_state.aml;
 
                        status =