summaryrefslogtreecommitdiffstats
path: root/drivers/platform
diff options
context:
space:
mode:
authorJoão Paulo Rechi Vita <jprvita@gmail.com>2016-06-13 22:57:34 +0200
committerDarren Hart <dvhart@linux.intel.com>2016-07-02 01:01:41 +0200
commit6b7ff2af5286a8c6bec7ff5f4df62e3506c1674e (patch)
treeb5c90f14be68265a9412c4eb7bfe6c5d51d2902d /drivers/platform
parentasus-wmi: Add quirk_no_rfkill for the Asus U303LB (diff)
downloadlinux-6b7ff2af5286a8c6bec7ff5f4df62e3506c1674e.tar.xz
linux-6b7ff2af5286a8c6bec7ff5f4df62e3506c1674e.zip
asus-wmi: Add quirk_no_rfkill for the Asus Z550MA
The Asus Z550MA 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. Signed-off-by: João Paulo Rechi Vita <jprvita@endlessm.com> Reported-by: Ming Shuo Chiu <chiu@endlessm.com> Reviewed-by: Corentin Chary <corentin.chary@gmail.com> Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Diffstat (limited to 'drivers/platform')
-rw-r--r--drivers/platform/x86/asus-nb-wmi.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c
index 9ff05121df59..a93a6dbe186d 100644
--- a/drivers/platform/x86/asus-nb-wmi.c
+++ b/drivers/platform/x86/asus-nb-wmi.c
@@ -337,6 +337,15 @@ static const struct dmi_system_id asus_quirks[] = {
},
.driver_data = &quirk_no_rfkill,
},
+ {
+ .callback = dmi_matched,
+ .ident = "ASUSTeK COMPUTER INC. Z550MA",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
+ DMI_MATCH(DMI_PRODUCT_NAME, "Z550MA"),
+ },
+ .driver_data = &quirk_no_rfkill,
+ },
{},
};