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

mariux64 · Jun 11, 2021 · 84b7355 · 84b7355
2 parents 159d8c2 + f39de44
commit 84b7355
Showing 1 changed file with 0 additions and 2 deletions.
diff --git 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);