mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 07:04:24 +00:00
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 commitb5f7311d3a
("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:aab9e7896e
("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 commit3bd12da7f5
("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 <hdegoede@redhat.com> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
This commit is contained in:
parent
efe813d0b0
commit
8a333dab28
1 changed files with 0 additions and 24 deletions
|
@ -593,33 +593,9 @@ static struct asus_wmi_driver asus_nb_wmi_driver = {
|
||||||
.detect_quirks = asus_nb_wmi_quirks,
|
.detect_quirks = asus_nb_wmi_quirks,
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct dmi_system_id asus_nb_wmi_blacklist[] __initconst = {
|
|
||||||
{
|
|
||||||
/*
|
|
||||||
* asus-nb-wm adds no functionality. The T100TA has a detachable
|
|
||||||
* USB kbd, so no hotkeys and it has no WMI rfkill; and loading
|
|
||||||
* asus-nb-wm causes the camera LED to turn and _stay_ on.
|
|
||||||
*/
|
|
||||||
.matches = {
|
|
||||||
DMI_EXACT_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
|
|
||||||
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "T100TA"),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
/* The Asus T200TA has the same issue as the T100TA */
|
|
||||||
.matches = {
|
|
||||||
DMI_EXACT_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
|
|
||||||
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "T200TA"),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{} /* Terminating entry */
|
|
||||||
};
|
|
||||||
|
|
||||||
static int __init asus_nb_wmi_init(void)
|
static int __init asus_nb_wmi_init(void)
|
||||||
{
|
{
|
||||||
if (dmi_check_system(asus_nb_wmi_blacklist))
|
|
||||||
return -ENODEV;
|
|
||||||
|
|
||||||
return asus_wmi_register_driver(&asus_nb_wmi_driver);
|
return asus_wmi_register_driver(&asus_nb_wmi_driver);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue