diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-02-10 19:12:12 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-02-10 19:12:12 +0100 |
| commit | 938bdd1d7dad75299201d1cc47c1dcf4d49f9274 (patch) | |
| tree | b927a1406ed88936d0ca9e67341d07a382955709 /drivers/acpi/acpica/psloop.c | |
| parent | Revert "ACPICA: Interpreter: fix memory leak by using existing buffer" (diff) | |
| parent | ACPICA: Update version to 20210105 (diff) | |
| download | linux-938bdd1d7dad75299201d1cc47c1dcf4d49f9274.tar.xz linux-938bdd1d7dad75299201d1cc47c1dcf4d49f9274.zip | |
Merge back ACPICA material for v5.12.
Diffstat (limited to 'drivers/acpi/acpica/psloop.c')
| -rw-r--r-- | drivers/acpi/acpica/psloop.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/acpi/acpica/psloop.c b/drivers/acpi/acpica/psloop.c index 3cf0687b9915..4b51dd939f29 100644 --- a/drivers/acpi/acpica/psloop.c +++ b/drivers/acpi/acpica/psloop.c @@ -3,7 +3,7 @@ * * Module Name: psloop - Main AML parse loop * - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * *****************************************************************************/ @@ -264,8 +264,7 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state) ACPI_TO_POINTER (TRUE)); if (ACPI_FAILURE(status) - && ((status & AE_CODE_MASK) != - AE_CODE_CONTROL)) { + && !ACPI_CNTL_EXCEPTION(status)) { if (status == AE_AML_NO_RETURN_VALUE) { ACPI_EXCEPTION((AE_INFO, status, "Invoked method did not return a value")); |