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

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
...@@ -994,14 +994,18 @@ static int __init acpi_bus_init(void) ...@@ -994,14 +994,18 @@ static int __init acpi_bus_init(void)
status = acpi_ec_ecdt_probe(); status = acpi_ec_ecdt_probe();
/* Ignore result. Not having an ECDT is not fatal. */ /* Ignore result. Not having an ECDT is not fatal. */
acpi_bus_osc_support();
status = acpi_initialize_objects(ACPI_FULL_INITIALIZATION); status = acpi_initialize_objects(ACPI_FULL_INITIALIZATION);
if (ACPI_FAILURE(status)) { if (ACPI_FAILURE(status)) {
printk(KERN_ERR PREFIX "Unable to initialize ACPI objects\n"); printk(KERN_ERR PREFIX "Unable to initialize ACPI objects\n");
goto error1; 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, * _PDC control method may load dynamic SSDT tables,
* and we need to install the table handler before that. * and we need to install the table handler before that.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment