Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932297Ab2ENUD1 (ORCPT ); Mon, 14 May 2012 16:03:27 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:50267 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932261Ab2ENUDZ (ORCPT ); Mon, 14 May 2012 16:03:25 -0400 From: Kamal Mostafa To: Matthew Garrett , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Mario Limonciello , Kamal Mostafa Subject: [PATCH v2] dell-laptop: rfkill blacklist Dell XPS 13z, 15 Date: Mon, 14 May 2012 13:03:02 -0700 Message-Id: <1337025782-14009-1-git-send-email-kamal@canonical.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1337023652-11661-1-git-send-email-kamal@canonical.com> References: <1337023652-11661-1-git-send-email-kamal@canonical.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1557 Lines: 47 From: Mario Limonciello On Dell XPS 13z (L321X) and 15 (L502X), switching off Bluetooth also disables wifi. Fix by adding those models to the dell_blacklist table. BugLink: https://bugs.launchpad.net/bugs/901410 Signed-off-by: Mario Limonciello Signed-off-by: Kamal Mostafa --- 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", -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/