asus-wmi: Add quirk_no_rfkill_wapf4 for the Asus X456UA

jprvita · dvhart · commit 56a37a72002b · 2016-07-01T16:05:47.000-07:00
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 &lt;jprvita@endlessm.com&gt;
Reported-by: Angela Traeger &lt;angie@endlessm.com&gt;
Reviewed-by: Corentin Chary &lt;corentin.chary@gmail.com&gt;
Signed-off-by: Darren Hart &lt;dvhart@linux.intel.com&gt;
diff --git 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,

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ static const struct dmi_system_id asus_quirks[] = {`
`142`	`142`	`DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),`
`143`	`143`	`DMI_MATCH(DMI_PRODUCT_NAME, "X456UA"),`
`144`	`144`	`},`
`145`		`- .driver_data = &quirk_asus_wapf4,`
	`145`	`+ .driver_data = &quirk_no_rfkill_wapf4,`
`146`	`146`	`},`
`147`	`147`	`{`
`148`	`148`	`.callback = dmi_matched,`