Commit 43be8bde authored by Corentin Chary's avatar Corentin Chary Committed by Matthew Garrett

asus-wmi: add gps rfkill support

Signed-off-by: default avatarCorentin Chary <corentin.chary@gmail.com>
Signed-off-by: default avatarMatthew Garrett <mjg@redhat.com>
parent fddbfed5
...@@ -194,6 +194,7 @@ struct asus_wmi { ...@@ -194,6 +194,7 @@ struct asus_wmi {
struct asus_rfkill bluetooth; struct asus_rfkill bluetooth;
struct asus_rfkill wimax; struct asus_rfkill wimax;
struct asus_rfkill wwan3g; struct asus_rfkill wwan3g;
struct asus_rfkill gps;
struct hotplug_slot *hotplug_slot; struct hotplug_slot *hotplug_slot;
struct mutex hotplug_lock; struct mutex hotplug_lock;
...@@ -835,6 +836,11 @@ static void asus_wmi_rfkill_exit(struct asus_wmi *asus) ...@@ -835,6 +836,11 @@ static void asus_wmi_rfkill_exit(struct asus_wmi *asus)
rfkill_destroy(asus->wwan3g.rfkill); rfkill_destroy(asus->wwan3g.rfkill);
asus->wwan3g.rfkill = NULL; 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) static int asus_wmi_rfkill_init(struct asus_wmi *asus)
...@@ -869,6 +875,12 @@ 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) if (result && result != -ENODEV)
goto exit; 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) if (!asus->driver->hotplug_wireless)
goto exit; goto exit;
...@@ -1721,6 +1733,10 @@ static int asus_hotk_restore(struct device *device) ...@@ -1721,6 +1733,10 @@ static int asus_hotk_restore(struct device *device)
bl = !asus_wmi_get_devstate_simple(asus, ASUS_WMI_DEVID_WWAN3G); bl = !asus_wmi_get_devstate_simple(asus, ASUS_WMI_DEVID_WWAN3G);
rfkill_set_sw_state(asus->wwan3g.rfkill, bl); 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; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment