Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc54ab72 authored by Lin Ming's avatar Lin Ming Committed by Len Brown
Browse files

ACPI: run _OSC after ACPI_FULL_INITIALIZATION 



The _OSC method may exist in module level code,
so it must be called after ACPI_FULL_INITIALIZATION

On some new platforms with Zero-Power-Optical-Disk-Drive (ZPODD)
support, this fix is necessary to save power.

Signed-off-by: default avatarLin Ming <ming.m.lin@intel.com>
Tested-by: default avatarAaron Lu <aaron.lu@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
Cc: stable@vger.kernel.org
parent 979570e0

drivers/acpi/bus.c

+6 −2
Original line number Diff line number Diff line
@@ -994,14 +994,18 @@ static int __init acpi_bus_init(void) 
	status = acpi_ec_ecdt_probe();

	/* Ignore result. Not having an ECDT is not fatal. */



	acpi_bus_osc_support();



	status = acpi_initialize_objects(ACPI_FULL_INITIALIZATION);

	if (ACPI_FAILURE(status)) {

		printk(KERN_ERR PREFIX "Unable to initialize ACPI objects\n");

		goto error1;

	}



	/*

	 * _OSC method may exist in module level code,

	 * so it must be run after ACPI_FULL_INITIALIZATION

	 */

	acpi_bus_osc_support();



	/*

	 * _PDC control method may load dynamic SSDT tables,

	 * and we need to install the table handler before that.