summaryrefslogtreecommitdiff
path: root/drivers/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2021-08-30 19:27:13 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2021-08-30 19:27:13 +0200
commitb46a8eda83b4d8cf6fff0971bc17baba48535582 (patch)
treed7109dc5d338e93a2528b93e7d968831525cadd8 /drivers/acpi
parent294c34e704e78d641b039064ce72d4531afe0088 (diff)
parent696e0c937d07a79341d6e5da23fb6abc1d2f842b (diff)
downloadlwn-b46a8eda83b4d8cf6fff0971bc17baba48535582.tar.gz
lwn-b46a8eda83b4d8cf6fff0971bc17baba48535582.zip
Merge branch 'acpica'
* acpica: ACPICA: Update version to 20210730 ACPICA: Add method name "_DIS" For use with aslmethod.c ACPICA: iASL: Fix for WPBT table with no command-line arguments ACPICA: Headers: Add new DBG2 Serial Port Subtypes ACPICA: Macros should not use a trailing semicolon ACPICA: Fix an if statement (add parens) ACPICA: iASL: Add support for the AEST table (data compiler)
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/acpica/dswexec.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/acpi/acpica/dswexec.c b/drivers/acpi/acpica/dswexec.c
index 41ba7773fd10..f2d2267054af 100644
--- a/drivers/acpi/acpica/dswexec.c
+++ b/drivers/acpi/acpica/dswexec.c
@@ -561,11 +561,10 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
op->common.
node->object,
NULL);
- if ACPI_FAILURE
- (status) {
+ if (ACPI_FAILURE(status)) {
ACPI_EXCEPTION((AE_INFO, status,
"While writing to buffer field"));
- }
+ }
}
ACPI_FREE(namepath);
status = AE_OK;