Merge back 'acpi-bus' material for v5.14.

This commit is contained in:
Rafael J. Wysocki 2021-06-11 18:13:48 +02:00
commit 84b7355b7a

View file

@ -262,8 +262,6 @@ acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context)
out_kfree: out_kfree:
kfree(output.pointer); kfree(output.pointer);
if (status != AE_OK)
context->ret.pointer = NULL;
return status; return status;
} }
EXPORT_SYMBOL(acpi_run_osc); EXPORT_SYMBOL(acpi_run_osc);