diff options
| author | AceLan Kao <acelan.kao@canonical.com> | 2013-05-30 10:31:50 +0800 |
|---|---|---|
| committer | Matthew Garrett <matthew.garrett@nebula.com> | 2013-07-10 15:42:47 -0400 |
| commit | e8f56c80aedacfb1552509c0e4ed265266328bc4 (patch) | |
| tree | fb9e6102ebe09a4109937600c327a80d02143559 | |
| parent | b5f4f9ef0125845cd03dc9de5dbe1344e60474d0 (diff) | |
| download | linux-e8f56c80aedacfb1552509c0e4ed265266328bc4.tar.gz linux-e8f56c80aedacfb1552509c0e4ed265266328bc4.tar.bz2 linux-e8f56c80aedacfb1552509c0e4ed265266328bc4.zip | |
asus-wmi: control wlan-led only if wapf == 4
Controlling the wlan led seems to have some side effects to the machines
with wapf value is not equal to 4. It will make the keyboard backlight
out of order.
So, the patch will enable the wlan led function only if the wapf == 4.
Bug: https://bugzilla.kernel.org/show_bug.cgi?id=46791
Reported-by: Mirto Silvio Busico <m.busico@ieee.org>
Tested-by: Karol Herbst <karolherbst@me.com>
Tested-by: drunkenbatman <drunkenbatman@gmail.com>
Signed-off-by: AceLan Kao <acelan.kao@canonical.com>
Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
| -rw-r--r-- | drivers/platform/x86/asus-wmi.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c index 0e58d748d7f6..19c313b056c3 100644 --- a/drivers/platform/x86/asus-wmi.c +++ b/drivers/platform/x86/asus-wmi.c @@ -558,7 +558,7 @@ static int asus_wmi_led_init(struct asus_wmi *asus) goto error; } - if (wlan_led_presence(asus)) { + if (wlan_led_presence(asus) && (asus->driver->quirks->wapf == 4)) { INIT_WORK(&asus->wlan_led_work, wlan_led_update); asus->wlan_led.name = "asus::wlan"; @@ -886,7 +886,8 @@ static int asus_new_rfkill(struct asus_wmi *asus, if (!*rfkill) return -EINVAL; - if (dev_id == ASUS_WMI_DEVID_WLAN) + if ((dev_id == ASUS_WMI_DEVID_WLAN) && + (asus->driver->quirks->wapf == 4)) rfkill_set_led_trigger_name(*rfkill, "asus-wlan"); rfkill_init_sw_state(*rfkill, !result); |