asus-wmi: control wlan-led if wapf > 0
authorAceLan Kao <acelan.kao@canonical.com>
Wed, 9 Jul 2014 08:18:18 +0000 (16:18 +0800)
committerMatthew Garrett <matthew.garrett@nebula.com>
Sat, 16 Aug 2014 08:23:50 +0000 (01:23 -0700)
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>
drivers/platform/x86/asus-wmi.c

index 8a8841668992e9251981b16d42de01619cbe2937..21fc932da3a1461d35697cc2ee2c78085128b434 100644 (file)
@@ -555,7 +555,7 @@ static int asus_wmi_led_init(struct asus_wmi *asus)
                        goto error;
        }
 
-       if (wlan_led_presence(asus) && (asus->driver->quirks->wapf == 4)) {
+       if (wlan_led_presence(asus) && (asus->driver->quirks->wapf > 0)) {
                INIT_WORK(&asus->wlan_led_work, wlan_led_update);
 
                asus->wlan_led.name = "asus::wlan";
@@ -885,7 +885,7 @@ static int asus_new_rfkill(struct asus_wmi *asus,
                return -EINVAL;
 
        if ((dev_id == ASUS_WMI_DEVID_WLAN) &&
-                       (asus->driver->quirks->wapf == 4))
+                       (asus->driver->quirks->wapf > 0))
                rfkill_set_led_trigger_name(*rfkill, "asus-wlan");
 
        rfkill_init_sw_state(*rfkill, !result);