From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Lee, Chun-Yi" Subject: [PATCH 3/3] acer-wmi: check the existence of internal wireless device when set capability Date: Thu, 18 Aug 2011 18:47:34 +0800 Message-ID: <1313664454-2762-3-git-send-email-jlee@suse.com> References: <1313664454-2762-1-git-send-email-jlee@suse.com> <1313664454-2762-2-git-send-email-jlee@suse.com> Return-path: Received: from mail-yi0-f46.google.com ([209.85.218.46]:45457 "EHLO mail-yi0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750785Ab1HRKv0 (ORCPT ); Thu, 18 Aug 2011 06:51:26 -0400 Received: by yie30 with SMTP id 30so1373823yie.19 for ; Thu, 18 Aug 2011 03:51:25 -0700 (PDT) In-Reply-To: <1313664454-2762-2-git-send-email-jlee@suse.com> Sender: platform-driver-x86-owner@vger.kernel.org List-ID: To: mjg@redhat.com Cc: platform-driver-x86@vger.kernel.org, "Lee, Chun-Yi" , Carlos Corbacho , Dmitry Torokhov , Corentin Chary , Thomas Renninger That will be better to check the existence of internal wireless device when we set wireless capability and generate killswitch for it. It can avoid userland access wireless rfkill but the machine doesn't have internal wireless device. Tested on Acer Travelmate 8572 Cc: Carlos Corbacho Cc: Matthew Garrett Cc: Dmitry Torokhov Cc: Corentin Chary Cc: Thomas Renninger Signed-off-by: Lee, Chun-Yi --- drivers/platform/x86/acer-wmi.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c index b663334..5130c63 100644 --- a/drivers/platform/x86/acer-wmi.c +++ b/drivers/platform/x86/acer-wmi.c @@ -1085,7 +1085,9 @@ static acpi_status WMID_set_capabilities(void) return AE_ERROR; } - interface->capability |= ACER_CAP_WIRELESS; + pr_info("Function bitmap for Communication Device: 0x%x\n", devices); + if (devices & 0x07) + interface->capability |= ACER_CAP_WIRELESS; if (devices & 0x40) interface->capability |= ACER_CAP_THREEG; if (devices & 0x10) -- 1.6.0.2