From patchwork Mon Jan 24 23:41:31 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kamal Mostafa X-Patchwork-Id: 80290 X-Patchwork-Delegate: stefan.bader@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id F04ABB711E for ; Tue, 25 Jan 2011 10:41:52 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1PhW2S-00057W-V5; Mon, 24 Jan 2011 23:41:37 +0000 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1PhW2R-00057R-5a for kernel-team@lists.ubuntu.com; Mon, 24 Jan 2011 23:41:35 +0000 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1PhW2R-0006Xl-31 for ; Mon, 24 Jan 2011 23:41:35 +0000 Received: from c-98-234-57-120.hsd1.ca.comcast.net ([98.234.57.120] helo=[192.168.1.7]) by hutte.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1PhW2Q-0005bS-Mb for kernel-team@lists.ubuntu.com; Mon, 24 Jan 2011 23:41:35 +0000 Subject: Re: [maverick-SRU][PATCH] UBUNTU: dell-laptop: Add another Dell laptop family to the DMI whitelist From: Kamal Mostafa To: kernel-team@lists.ubuntu.com In-Reply-To: <4D3DEAC4.5000507@canonical.com> References: <1295902454.16789.72.camel@fourier> <4D3DEAC4.5000507@canonical.com> Date: Mon, 24 Jan 2011 15:41:31 -0800 Message-ID: <1295912491.16789.80.camel@fourier> Mime-Version: 1.0 X-Mailer: Evolution 2.30.3 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com (Resubmit with rtg's corrections and Ack) SRU Justification: Impact: We need this patch to fix Wi-fi kill switch behavior on some upcoming Dell systems. I submitted the patch to stable on 2010-12-22, where it is still pending review. Fix: The following patch is taken from upstream and is included in >= 2.6.36. Testcase: We have tested this patch internally (LP: #687526). Acked-by: Stefan Bader --- commit f5d19c5d6db2226f5561292b06d42d74ea64bfff Author: Rezwanul Kabir Date: Wed Jun 23 12:02:43 2010 -0500 UBUNTU: dell-laptop: Add another Dell laptop family to the DMI whitelist This is to support Precision M4500 and others. BugLink: http://bugs.launchpad.net/bugs/693078 Signed-off-by: Rezwanul Kabir Signed-off-by: Matthew Garrett (cherry picked from commit 410d44c74cf9942e3055d5b7d73953fac8efbacb) Signed-off-by: Kamal Mostafa Acked-by: Tim Gardner diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c index 6110601..0fb56e0 100644 --- a/drivers/platform/x86/dell-laptop.c +++ b/drivers/platform/x86/dell-laptop.c @@ -83,6 +83,12 @@ static const struct dmi_system_id __initdata dell_device_table[] = { }, }, { + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_CHASSIS_TYPE, "9"), /*Laptop*/ + }, + }, + { .ident = "Dell Computer Corporation", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"), @@ -628,4 +634,5 @@ MODULE_AUTHOR("Matthew Garrett "); MODULE_DESCRIPTION("Dell laptop driver"); MODULE_LICENSE("GPL"); MODULE_ALIAS("dmi:*svnDellInc.:*:ct8:*"); +MODULE_ALIAS("dmi:*svnDellInc.:*:ct9:*"); MODULE_ALIAS("dmi:*svnDellComputerCorporation.:*:ct8:*");