From: João Paulo Rechi Vita Date: Mon, 13 Jun 2016 20:57:36 +0000 (-0400) Subject: asus-wmi: Add quirk_no_rfkill_wapf4 for the Asus X456UA X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=56a37a72002b1eb01a1de391cf66383652784e78;p=deliverable%2Flinux.git asus-wmi: Add quirk_no_rfkill_wapf4 for the Asus X456UA The Asus X456UA has an airplane-mode indicator LED and the WMI WLAN user bit set, so asus-wmi uses ASUS_WMI_DEVID_WLAN_LED (0x00010002) to store the wlan state, which has a side-effect of driving the airplane mode indicator LED in an inverted fashion. quirk_no_rfkill prevents asus-wmi from registering RFKill switches at all for this laptop and allows asus-wireless to drive the LED through the ASHS ACPI device. This laptop already has a quirk for setting WAPF=4, so use quirk_no_rfkill_wapf4, which both disables rfkill and sets WAPF=4. Signed-off-by: João Paulo Rechi Vita Reported-by: Angela Traeger Reviewed-by: Corentin Chary Signed-off-by: Darren Hart --- diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c index 8e5255d465d5..adecc1c555f0 100644 --- a/drivers/platform/x86/asus-nb-wmi.c +++ b/drivers/platform/x86/asus-nb-wmi.c @@ -142,7 +142,7 @@ static const struct dmi_system_id asus_quirks[] = { DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), DMI_MATCH(DMI_PRODUCT_NAME, "X456UA"), }, - .driver_data = &quirk_asus_wapf4, + .driver_data = &quirk_no_rfkill_wapf4, }, { .callback = dmi_matched,