diff options
| author | Lee, Chun-Yi <joeyli.kernel@gmail.com> | 2011-05-22 07:33:52 +0800 |
|---|---|---|
| committer | Matthew Garrett <mjg@redhat.com> | 2011-05-27 12:38:49 -0400 |
| commit | a8d1a266eee5f8b822449fe19d1735189377ef47 (patch) | |
| tree | 8b968d1b8019d1e365a635539a0e02d15a23a1e0 /drivers/platform/x86/acer-wmi.c | |
| parent | 5ddf9c5fa5a78036790ed72aaed3b84ee7dd4532 (diff) | |
acer-wmi: check the existence of internal 3G device when set capability
That will be better to check the existence of internal 3G device when
we set threeg capability and generate killswitch for threeg. It can
avoid userland access 3G rfkill but the machine doesn't have internal
3G device.
Reference: bko#32862
https://bugzilla.kernel.org/show_bug.cgi?id=32862
Tested on Acer Aspire 8930G, Acer Travelmate 8572
Tested-by: Hector Martin <hector@marcansoft.com>
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@novell.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Diffstat (limited to 'drivers/platform/x86/acer-wmi.c')
| -rw-r--r-- | drivers/platform/x86/acer-wmi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c index 57c6c8a4db2..92ee4d63727 100644 --- a/drivers/platform/x86/acer-wmi.c +++ b/drivers/platform/x86/acer-wmi.c @@ -889,7 +889,8 @@ static acpi_status WMID_set_capabilities(void) dmi_walk(type_aa_dmi_decode, NULL); if (!has_type_aa) { interface->capability |= ACER_CAP_WIRELESS; - interface->capability |= ACER_CAP_THREEG; + if (devices & 0x40) + interface->capability |= ACER_CAP_THREEG; if (devices & 0x10) interface->capability |= ACER_CAP_BLUETOOTH; } |