diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-06-11 18:13:48 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-06-11 18:13:48 +0200 |
| commit | 84b7355b7a8acc0c4924424e22b86771a6d7287a (patch) | |
| tree | 033c66474e9813e8de6f7ced8359bb182cdb43d5 | |
| parent | ACPI: Pass the same capabilities to the _OSC regardless of the query flag (diff) | |
| parent | ACPI: Remove redundant clearing of context->ret.pointer from acpi_run_osc() (diff) | |
| download | wireguard-linux-84b7355b7a8acc0c4924424e22b86771a6d7287a.tar.xz wireguard-linux-84b7355b7a8acc0c4924424e22b86771a6d7287a.zip | |
Merge back 'acpi-bus' material for v5.14.
Diffstat (limited to '')
| -rw-r--r-- | drivers/acpi/bus.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index a4bd673934c0..ab41185cd2a8 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -262,8 +262,6 @@ out_success: out_kfree: kfree(output.pointer); - if (status != AE_OK) - context->ret.pointer = NULL; return status; } EXPORT_SYMBOL(acpi_run_osc); |