summaryrefslogtreecommitdiffstats
path: root/drivers/platform
diff options
context:
space:
mode:
authorLee, Chun-Yi <joeyli.kernel@gmail.com>2011-08-18 18:47:34 +0800
committerMatthew Garrett <mjg@redhat.com>2011-10-24 16:52:42 +0200
commit1fbc01a7b0f2cf5dc375ecde3833df2fbbfdc812 (patch)
tree630776d044bf599c1f7e2e1826db74b3a571e6ce /drivers/platform
parent72e71de15fceb0fd7cdfd8bb35f4f8aa8b0e20b5 (diff)
downloadlinux-stable-1fbc01a7b0f2cf5dc375ecde3833df2fbbfdc812.tar.gz
linux-stable-1fbc01a7b0f2cf5dc375ecde3833df2fbbfdc812.tar.bz2
linux-stable-1fbc01a7b0f2cf5dc375ecde3833df2fbbfdc812.zip
acer-wmi: check the existence of internal wireless device when set capability
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 <carlos@strangeworlds.co.uk> Cc: Matthew Garrett <mjg@redhat.com> Cc: Dmitry Torokhov <dtor@mail.ru> Cc: Corentin Chary <corentincj@iksaif.net> Cc: Thomas Renninger <trenn@suse.de> Signed-off-by: Lee, Chun-Yi <jlee@suse.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
Diffstat (limited to 'drivers/platform')
-rw-r--r--drivers/platform/x86/acer-wmi.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c
index 017b1a7eac8e..ca52639af2d1 100644
--- a/drivers/platform/x86/acer-wmi.c
+++ b/drivers/platform/x86/acer-wmi.c
@@ -1094,7 +1094,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)