| Message ID | 1465851456-1421-8-git-send-email-jprvita@endlessm.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
On Mon, Jun 13, 2016 at 04:57:36PM -0400, João Paulo Rechi Vita wrote: > 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 this commit creates a new quirk, quirk_no_rfkill_wapf4, which > both disables rfkill and sets WAPF=4. Corrected this last bit of the comment to say "use" instead of "creates a new quirk" since that was done in 6/7. Otherwise, all is well, and thank you for sticking with this and seeing it through João, much appreciated. Queued to testing for 4.8. > > Signed-off-by: João Paulo Rechi Vita <jprvita@endlessm.com> > Reported-by: Angela Traeger <angie@endlessm.com> > --- > drivers/platform/x86/asus-nb-wmi.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c > index 87cd60b..87d618f 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, > -- > 2.5.0 > > -- > To unsubscribe from this list: send the line "unsubscribe platform-driver-x86" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html >
diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c index 87cd60b..87d618f 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,
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 this commit creates a new quirk, quirk_no_rfkill_wapf4, which both disables rfkill and sets WAPF=4. Signed-off-by: João Paulo Rechi Vita <jprvita@endlessm.com> Reported-by: Angela Traeger <angie@endlessm.com> --- drivers/platform/x86/asus-nb-wmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)