diff options
author | AceLan Kao <acelan.kao@canonical.com> | 2014-07-09 04:18:18 -0400 |
---|---|---|
committer | Matthew Garrett <matthew.garrett@nebula.com> | 2014-08-16 04:23:50 -0400 |
commit | f515623cac706e616c48778e5e611020dff44e19 (patch) | |
tree | bf908508e4c29afb7dd9e649892c40e016461ba1 /drivers/platform | |
parent | 86ac2735ae09ab012da358d4dff73f3bcad50583 (diff) |
asus-wmi: control wlan-led if wapf > 0
Wifi will be controlled by asus-wmi driver when wapf > 0
So, controls the wifi-led when wapf > 0
Signed-off-by: AceLan Kao <acelan.kao@canonical.com>
Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
Diffstat (limited to 'drivers/platform')
-rw-r--r-- | drivers/platform/x86/asus-wmi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c index 8a8841668992..21fc932da3a1 100644 --- a/drivers/platform/x86/asus-wmi.c +++ b/drivers/platform/x86/asus-wmi.c | |||
@@ -555,7 +555,7 @@ static int asus_wmi_led_init(struct asus_wmi *asus) | |||
555 | goto error; | 555 | goto error; |
556 | } | 556 | } |
557 | 557 | ||
558 | if (wlan_led_presence(asus) && (asus->driver->quirks->wapf == 4)) { | 558 | if (wlan_led_presence(asus) && (asus->driver->quirks->wapf > 0)) { |
559 | INIT_WORK(&asus->wlan_led_work, wlan_led_update); | 559 | INIT_WORK(&asus->wlan_led_work, wlan_led_update); |
560 | 560 | ||
561 | asus->wlan_led.name = "asus::wlan"; | 561 | asus->wlan_led.name = "asus::wlan"; |
@@ -885,7 +885,7 @@ static int asus_new_rfkill(struct asus_wmi *asus, | |||
885 | return -EINVAL; | 885 | return -EINVAL; |
886 | 886 | ||
887 | if ((dev_id == ASUS_WMI_DEVID_WLAN) && | 887 | if ((dev_id == ASUS_WMI_DEVID_WLAN) && |
888 | (asus->driver->quirks->wapf == 4)) | 888 | (asus->driver->quirks->wapf > 0)) |
889 | rfkill_set_led_trigger_name(*rfkill, "asus-wlan"); | 889 | rfkill_set_led_trigger_name(*rfkill, "asus-wlan"); |
890 | 890 | ||
891 | rfkill_init_sw_state(*rfkill, !result); | 891 | rfkill_init_sw_state(*rfkill, !result); |