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

84b7355b · Rafael J. Wysocki · 159d8c27 · f39de44f · 84b7355b
Commit 84b7355b authored Jun 11, 2021 by Rafael J. Wysocki
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

drivers/acpi/bus.c drivers/acpi/bus.c +0 -2

No files found.
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -262,8 +262,6 @@ acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context)

 out_kfree:
 	kfree(output.pointer);
-	if (status != AE_OK)
-		context->ret.pointer = NULL;
 	return status;
 }
 EXPORT_SYMBOL(acpi_run_osc);