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

rafaeljw · rafaeljw · commit 84b7355b7a8a · 2021-06-11T18:13:48.000+02:00
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);

Original file line number	Diff line number	Diff line change
`@@ -262,8 +262,6 @@ acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context)`
`262`	`262`
`263`	`263`	`out_kfree:`
`264`	`264`	`kfree(output.pointer);`
`265`		`- if (status != AE_OK)`
`266`		`- context->ret.pointer = NULL;`
`267`	`265`	`return status;`
`268`	`266`	`}`
`269`	`267`	`EXPORT_SYMBOL(acpi_run_osc);`