From patchwork Mon Jul 16 08:30:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lin Ming X-Patchwork-Id: 1200281 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 422DEE0038 for ; Mon, 16 Jul 2012 08:30:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752902Ab2GPIaY (ORCPT ); Mon, 16 Jul 2012 04:30:24 -0400 Received: from mga01.intel.com ([192.55.52.88]:14656 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752195Ab2GPIaX (ORCPT ); Mon, 16 Jul 2012 04:30:23 -0400 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 16 Jul 2012 01:30:22 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.71,315,1320652800"; d="scan'208";a="193290677" Received: from minggr.sh.intel.com (HELO [10.239.36.45]) ([10.239.36.45]) by fmsmga002.fm.intel.com with ESMTP; 16 Jul 2012 01:30:21 -0700 Subject: [PATCH] acpi: run _OSC after ACPI_FULL_INITIALIZATION From: Lin Ming To: lenb Cc: linux-acpi , "Moore, Robert" Date: Mon, 16 Jul 2012 16:30:21 +0800 Message-ID: <1342427421.3628.216.camel@minggr> Mime-Version: 1.0 X-Mailer: Evolution 2.30.3 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org _OSC method may exist in module level code, so it must be called after ACPI_FULL_INITIALIZATION Signed-off-by: Lin Ming --- drivers/acpi/bus.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index adceafd..3532d52 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -980,8 +980,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"); @@ -989,6 +987,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. */