Skip to content

Commit 8a333da

Browse files
jwrdegoedeandy-shev
authored andcommitted
platform/x86: asus-nb-wmi: Revert "Do not load on Asus T100TA and T200TA"
The WMI INIT method on for some reason turns on the camera LED on these 2-in-1s, without the WMI interface allowing further control over the LED. To fix this commit b5f7311 ("platform/x86: asus-nb-wmi: Do not load on Asus T100TA and T200TA") added a blacklist with these 2 models on it since the WMI driver did not add any extra functionality to these models. Recently I've been working on making more 2-in-1 models report their tablet-mode (SW_TABLET_MODE) to userspace; and I've found that these 2 Asus models report this through WMI. This commit reverts the adding of the blacklist, so that the Asus WMI driver can be used on these models to report their tablet-mode. I have another patch fixing the LED issue in a different manner. Note this is the second time the we revert the adding of the asus_nb_wmi_blacklist. It was reverted before in commit: aab9e78 ("platform/x86: asus-nb-wmi: Revert "Do not load on Asus T100TA and T200TA")" But some how (accidentally re-applying of the patch?) it got re-added again in commit 3bd12da ("platform/x86: asus-nb-wmi: Do not load on Asus T100TA and T200TA"), so now we need to revert it again. Signed-off-by: Hans de Goede <[email protected]> Signed-off-by: Andy Shevchenko <[email protected]>
1 parent efe813d commit 8a333da

File tree

1 file changed

+0
-24
lines changed

1 file changed

+0
-24
lines changed

drivers/platform/x86/asus-nb-wmi.c

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -593,33 +593,9 @@ static struct asus_wmi_driver asus_nb_wmi_driver = {
593593
.detect_quirks = asus_nb_wmi_quirks,
594594
};
595595

596-
static const struct dmi_system_id asus_nb_wmi_blacklist[] __initconst = {
597-
{
598-
/*
599-
* asus-nb-wm adds no functionality. The T100TA has a detachable
600-
* USB kbd, so no hotkeys and it has no WMI rfkill; and loading
601-
* asus-nb-wm causes the camera LED to turn and _stay_ on.
602-
*/
603-
.matches = {
604-
DMI_EXACT_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
605-
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "T100TA"),
606-
},
607-
},
608-
{
609-
/* The Asus T200TA has the same issue as the T100TA */
610-
.matches = {
611-
DMI_EXACT_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
612-
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "T200TA"),
613-
},
614-
},
615-
{} /* Terminating entry */
616-
};
617596

618597
static int __init asus_nb_wmi_init(void)
619598
{
620-
if (dmi_check_system(asus_nb_wmi_blacklist))
621-
return -ENODEV;
622-
623599
return asus_wmi_register_driver(&asus_nb_wmi_driver);
624600
}
625601

0 commit comments

Comments
 (0)