diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2021-01-04 22:20:55 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2021-01-04 22:20:55 +0000 |
| commit | a4634ed7779f0905e3bfeb781e58d40a5bdf9bb7 (patch) | |
| tree | 8e0e40f55257c63c3329cc4d985dd0640d3b2d26 /source/components/parser | |
| parent | 960614968e0da10b32875a57ea1e30cc9c85b5e0 (diff) | |
Import ACPICA 20201217.vendor/acpica/20201217
Diffstat (limited to 'source/components/parser')
| -rw-r--r-- | source/components/parser/psloop.c | 3 | ||||
| -rw-r--r-- | source/components/parser/psparse.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/source/components/parser/psloop.c b/source/components/parser/psloop.c index 5b4b0d989bdd..6ccac91012b5 100644 --- a/source/components/parser/psloop.c +++ b/source/components/parser/psloop.c @@ -410,8 +410,7 @@ AcpiPsParseLoop ( */ WalkState->Op = NULL; Status = AcpiDsGetPredicateValue (WalkState, ACPI_TO_POINTER (TRUE)); - if (ACPI_FAILURE (Status) && - ((Status & AE_CODE_MASK) != AE_CODE_CONTROL)) + if (ACPI_FAILURE (Status) && !ACPI_CNTL_EXCEPTION (Status)) { if (Status == AE_AML_NO_RETURN_VALUE) { diff --git a/source/components/parser/psparse.c b/source/components/parser/psparse.c index d935ebc2df76..16458bc3e9d5 100644 --- a/source/components/parser/psparse.c +++ b/source/components/parser/psparse.c @@ -533,7 +533,7 @@ AcpiPsNextParseState ( default: Status = CallbackStatus; - if ((CallbackStatus & AE_CODE_MASK) == AE_CODE_CONTROL) + if (ACPI_CNTL_EXCEPTION (CallbackStatus)) { Status = AE_OK; } |