Skip to content

Commit aab9e78

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. Note, not calling INIT is also not an option, because then we will not receive events when the tablet-mode changes. So the LED issue will need to be fixed somewhere else entirely. Signed-off-by: Hans de Goede <[email protected]> Signed-off-by: Andy Shevchenko <[email protected]>
1 parent 476d60b commit aab9e78

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
@@ -515,33 +515,9 @@ static struct asus_wmi_driver asus_nb_wmi_driver = {
515515
.detect_quirks = asus_nb_wmi_quirks,
516516
};
517517

518-
static const struct dmi_system_id asus_nb_wmi_blacklist[] __initconst = {
519-
{
520-
/*
521-
* asus-nb-wm adds no functionality. The T100TA has a detachable
522-
* USB kbd, so no hotkeys and it has no WMI rfkill; and loading
523-
* asus-nb-wm causes the camera LED to turn and _stay_ on.
524-
*/
525-
.matches = {
526-
DMI_EXACT_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
527-
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "T100TA"),
528-
},
529-
},
530-
{
531-
/* The Asus T200TA has the same issue as the T100TA */
532-
.matches = {
533-
DMI_EXACT_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
534-
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "T200TA"),
535-
},
536-
},
537-
{} /* Terminating entry */
538-
};
539518

540519
static int __init asus_nb_wmi_init(void)
541520
{
542-
if (dmi_check_system(asus_nb_wmi_blacklist))
543-
return -ENODEV;
544-
545521
return asus_wmi_register_driver(&asus_nb_wmi_driver);
546522
}
547523

0 commit comments

Comments
 (0)