Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e8f56c80 authored by AceLan Kao's avatar AceLan Kao Committed by Matthew Garrett
Browse files

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: default avatarMirto Silvio Busico <m.busico@ieee.org>
Tested-by: default avatarKarol Herbst <karolherbst@me.com>
Tested-by: default avatardrunkenbatman <drunkenbatman@gmail.com>
Signed-off-by: default avatarAceLan Kao <acelan.kao@canonical.com>
Signed-off-by: default avatarMatthew Garrett <matthew.garrett@nebula.com>
parent b5f4f9ef

drivers/platform/x86/asus-wmi.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -558,7 +558,7 @@ static int asus_wmi_led_init(struct asus_wmi *asus) 
			goto error;

			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);

		INIT_WORK(&asus->wlan_led_work, wlan_led_update);





		asus->wlan_led.name = "asus::wlan";

		asus->wlan_led.name = "asus::wlan";
@@ -886,7 +886,8 @@ static int asus_new_rfkill(struct asus_wmi *asus, 
	if (!*rfkill)

	if (!*rfkill)

		return -EINVAL;

		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_set_led_trigger_name(*rfkill, "asus-wlan");





	rfkill_init_sw_state(*rfkill, !result);

	rfkill_init_sw_state(*rfkill, !result);