From patchwork Mon Dec 21 08:13:15 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: "Zhang, Rui" <rui.zhang@intel.com>
X-Patchwork-Id: 69091
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id nBL89nLs011594
	for <patchwork-acpi@patchwork.kernel.org>;
	Mon, 21 Dec 2009 08:09:49 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751459AbZLUIJp (ORCPT
	<rfc822;patchwork-acpi@patchwork.kernel.org>);
	Mon, 21 Dec 2009 03:09:45 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751570AbZLUIJp
	(ORCPT <rfc822;linux-acpi-outgoing>);
	Mon, 21 Dec 2009 03:09:45 -0500
Received: from mga01.intel.com ([192.55.52.88]:57686 "EHLO mga01.intel.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751025AbZLUIJp (ORCPT <rfc822;linux-acpi@vger.kernel.org>);
	Mon, 21 Dec 2009 03:09:45 -0500
Received: from fmsmga002.fm.intel.com ([10.253.24.26])
	by fmsmga101.fm.intel.com with ESMTP; 21 Dec 2009 00:02:47 -0800
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="4.47,427,1257148800"; d="scan'208";a="525003851"
Received: from rzhang1-desktop.sh.intel.com (HELO [10.239.36.29])
	([10.239.36.29])
	by fmsmga002.fm.intel.com with ESMTP; 21 Dec 2009 00:09:22 -0800
Subject: [PATCH] ACPI: disable _OSI(Windows 2009) on Asus K50IJ
From: Zhang Rui <rui.zhang@intel.com>
To: Len Brown <lenb@kernel.org>
Cc: "linux-acpi@vger.kernel.org" <linux-acpi@vger.kernel.org>,
	"Zhang, Rui" <rui.zhang@intel.com>, Alex.Haeussler@googlemail.com
Date: Mon, 21 Dec 2009 16:13:15 +0800
Message-ID: <1261383195.12263.16.camel@rzhang1-desktop>
Mime-Version: 1.0
X-Mailer: Evolution 2.28.1 
Sender: linux-acpi-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-acpi.vger.kernel.org>
X-Mailing-List: linux-acpi@vger.kernel.org


Index: linux-2.6/drivers/acpi/blacklist.c
===================================================================
--- linux-2.6.orig/drivers/acpi/blacklist.c
+++ linux-2.6/drivers/acpi/blacklist.c
@@ -185,6 +185,12 @@ static int __init dmi_disable_osi_vista(
 	acpi_osi_setup("!Windows 2006");
 	return 0;
 }
+static int __init dmi_disable_osi_win7(const struct dmi_system_id *d)
+{
+	printk(KERN_NOTICE PREFIX "DMI detected: %s\n", d->ident);
+	acpi_osi_setup("!Windows 2009");
+	return 0;
+}
 
 static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
 	{
@@ -211,6 +217,14 @@ static struct dmi_system_id acpi_osi_dmi
 		     DMI_MATCH(DMI_PRODUCT_NAME, "Sony VGN-SR290J"),
 		},
 	},
+	{
+	.callback = dmi_disable_osi_win7,
+	.ident = "ASUS K50IJ",
+	.matches = {
+		     DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
+		     DMI_MATCH(DMI_PRODUCT_NAME, "K50IJ"),
+		},
+	},
 
 	/*
 	 * BIOS invocation of _OSI(Linux) is almost always a BIOS bug.