From patchwork Thu May 24 17:45:00 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kamal Mostafa X-Patchwork-Id: 161171 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 9E8E5B6F13 for ; Fri, 25 May 2012 03:45:18 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SXc62-0003e0-4X; Thu, 24 May 2012 17:45:10 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SXc5v-0003ZU-Oc for kernel-team@lists.ubuntu.com; Thu, 24 May 2012 17:45:03 +0000 Received: from c-50-131-198-216.hsd1.ca.comcast.net ([50.131.198.216] helo=[192.168.1.7]) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1SXc5v-0007V4-2V; Thu, 24 May 2012 17:45:03 +0000 Message-ID: <1337881500.4142.27.camel@fourier> Subject: [PATCH v2] UBUNTU: SAUCE: dell-laptop: rfkill blacklist Dell XPS 13z, 15 From: Kamal Mostafa To: kernel-team@lists.ubuntu.com Date: Thu, 24 May 2012 10:45:00 -0700 In-Reply-To: <1337023652-11661-1-git-send-email-kamal@canonical.com> References: <1337023652-11661-1-git-send-email-kamal@canonical.com> X-Mailer: Evolution 3.2.3-0ubuntu6 Mime-Version: 1.0 Cc: Kamal Mostafa , Mario Limonciello 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 From: Mario Limonciello BugLink: https://bugs.launchpad.net/bugs/901410 On Dell XPS 13z (L321X) and 15 (L502X), switching off Bluetooth also disables wifi. Fix by adding those models to the dell_blacklist table. Signed-off-by: Mario Limonciello Signed-off-by: Kamal Mostafa Acked-by: Seth Forshee --- drivers/platform/x86/dell-laptop.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c index e6c08ee..35b38cc 100644 --- a/drivers/platform/x86/dell-laptop.c +++ b/drivers/platform/x86/dell-laptop.c @@ -120,6 +120,21 @@ static const struct dmi_system_id __initdata dell_device_table[] = { MODULE_DEVICE_TABLE(dmi, dell_device_table); static struct dmi_system_id __devinitdata dell_blacklist[] = { + /* dell_laptop breaks rfkill behavior (LP: #901410) */ + { + .ident = "Dell XPS 13z", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Dell System XPS L321X"), + }, + }, + { + .ident = "Dell XPS 15", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Dell System XPS L502X"), + }, + }, /* Supported by compal-laptop */ { .ident = "Dell Mini 9",