diff options
| author | Corentin Chary <corentin.chary@gmail.com> | 2011-07-01 11:34:40 +0200 |
|---|---|---|
| committer | Matthew Garrett <mjg@redhat.com> | 2011-08-05 14:46:05 -0400 |
| commit | 43be8bde1fdfbe3f4dedfd04ca4f9d6dd1e04b46 (patch) | |
| tree | 1f2a0d4941d193eba8c4163072f8701e42a4ad95 /drivers/platform | |
| parent | fddbfed595b307f9dddc7a86ddfbcbcb80141e28 (diff) | |
| download | lwn-43be8bde1fdfbe3f4dedfd04ca4f9d6dd1e04b46.tar.gz lwn-43be8bde1fdfbe3f4dedfd04ca4f9d6dd1e04b46.zip | |
asus-wmi: add gps rfkill support
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-wmi.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c index 8787dfacf11d..57514deb8e2b 100644 --- a/drivers/platform/x86/asus-wmi.c +++ b/drivers/platform/x86/asus-wmi.c @@ -194,6 +194,7 @@ struct asus_wmi { struct asus_rfkill bluetooth; struct asus_rfkill wimax; struct asus_rfkill wwan3g; + struct asus_rfkill gps; struct hotplug_slot *hotplug_slot; struct mutex hotplug_lock; @@ -835,6 +836,11 @@ static void asus_wmi_rfkill_exit(struct asus_wmi *asus) rfkill_destroy(asus->wwan3g.rfkill); asus->wwan3g.rfkill = NULL; } + if (asus->gps.rfkill) { + rfkill_unregister(asus->gps.rfkill); + rfkill_destroy(asus->gps.rfkill); + asus->gps.rfkill = NULL; + } } static int asus_wmi_rfkill_init(struct asus_wmi *asus) @@ -869,6 +875,12 @@ static int asus_wmi_rfkill_init(struct asus_wmi *asus) if (result && result != -ENODEV) goto exit; + result = asus_new_rfkill(asus, &asus->gps, "asus-gps", + RFKILL_TYPE_GPS, ASUS_WMI_DEVID_GPS); + + if (result && result != -ENODEV) + goto exit; + if (!asus->driver->hotplug_wireless) goto exit; @@ -1721,6 +1733,10 @@ static int asus_hotk_restore(struct device *device) bl = !asus_wmi_get_devstate_simple(asus, ASUS_WMI_DEVID_WWAN3G); rfkill_set_sw_state(asus->wwan3g.rfkill, bl); } + if (asus->gps.rfkill) { + bl = !asus_wmi_get_devstate_simple(asus, ASUS_WMI_DEVID_GPS); + rfkill_set_sw_state(asus->gps.rfkill, bl); + } return 0; } |