diff options
| author | Corentin Chary <corentin.chary@gmail.com> | 2011-12-15 08:27:35 +0100 |
|---|---|---|
| committer | Matthew Garrett <mjg@redhat.com> | 2012-03-20 12:02:17 -0400 |
| commit | 3c8671ffd334cfb692089ec00141b56d5a796ae7 (patch) | |
| tree | 5d4238adced28ae322089b848617e34470d74c29 /drivers/platform | |
| parent | 774b06780be20d07c5459becd6495c04523a93a2 (diff) | |
| download | blackbird-op-linux-3c8671ffd334cfb692089ec00141b56d5a796ae7.tar.gz blackbird-op-linux-3c8671ffd334cfb692089ec00141b56d5a796ae7.zip | |
asus-laptop: add rfkill interfaces for wlan and wwan
But don't try to do than on pegatron tablets to avoid any
conflict.
Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/x86/asus-laptop.c | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c index e416867c0725..547b9eba03ae 100644 --- a/drivers/platform/x86/asus-laptop.c +++ b/drivers/platform/x86/asus-laptop.c @@ -282,6 +282,7 @@ struct asus_laptop { struct asus_rfkill wlan; struct asus_rfkill bluetooth; struct asus_rfkill wwan; + struct asus_rfkill wimax; struct asus_rfkill gps; acpi_handle handle; /* the handle of the hotk device */ @@ -1291,6 +1292,10 @@ static int asus_rfkill_set(void *data, bool blocked) return asus_wlan_set(asus, !blocked); else if (rfk->control_id == BT_RSTS) return asus_bluetooth_set(asus, !blocked); + else if (rfk->control_id == WM_RSTS) + return asus_wimax_set(asus, !blocked); + else if (rfk->control_id == WW_RSTS) + return asus_wwan_set(asus, !blocked); return -EINVAL; } @@ -1343,6 +1348,9 @@ static int asus_rfkill_init(struct asus_laptop *asus) { int result = 0; + if (asus->is_pega_lucid) + return -ENODEV; + if (!acpi_check_handle(asus->handle, METHOD_GPS_ON, NULL) && !acpi_check_handle(asus->handle, METHOD_GPS_OFF, NULL) && !acpi_check_handle(asus->handle, METHOD_GPS_STATUS, NULL)) @@ -1368,6 +1376,20 @@ static int asus_rfkill_init(struct asus_laptop *asus) if (result) goto exit; + if (!acpi_check_handle(asus->handle, METHOD_WWAN, NULL)) + result = asus_rfkill_setup(asus, &asus->wwan, "asus-wwan", + WW_RSTS, RFKILL_TYPE_WWAN, + &asus_rfkill_ops); + if (result) + goto exit; + + if (!acpi_check_handle(asus->handle, METHOD_WIMAX, NULL)) + result = asus_rfkill_setup(asus, &asus->wimax, "asus-wimax", + WM_RSTS, RFKILL_TYPE_WIMAX, + &asus_rfkill_ops); + if (result) + goto exit; + exit: if (result) asus_rfkill_exit(asus); @@ -1859,7 +1881,7 @@ static int __devinit asus_acpi_add(struct acpi_device *device) goto fail_led; result = asus_rfkill_init(asus); - if (result) + if (result && result != -ENODEV) goto fail_rfkill; result = pega_accel_init(asus); |
