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: Lin Ming <ming.m.lin@intel.com>
Tested-by: Aaron Lu <aaron.lu@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Cc: stable@vger.kernel.org

1 files changed, 6 insertions, 2 deletions

diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index e0596954290..d59175efc42 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -994,8 +994,6 @@ 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");
@@ -1003,6 +1001,12 @@ static int __init acpi_bus_init(void)
         }
 
         /*
+         * _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.
          */