Revert "Input: i8042 - add ThinkPad S230u to i8042 nomux list"
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 28 Apr 2020 01:06:02 +0000 (18:06 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 28 Apr 2020 01:06:02 +0000 (18:06 -0700)
This reverts commit 18931506465a762ffd3f4803d36a18d336a67da9. From Kevin
Locke:

"... nomux only appeared to fix the issue because the controller
continued working after warm reboots. After more thorough testing from
both warm and cold start, I now believe the entry should be added to
i8042_dmi_reset_table rather than i8042_dmi_nomux_table as i8042.reset=1
alone is sufficient to avoid the issue from both states while
i8042.nomux is not."

drivers/input/serio/i8042-x86ia64io.h

index 5bbc915..08e919d 100644 (file)
@@ -541,13 +541,6 @@ static const struct dmi_system_id __initconst i8042_dmi_nomux_table[] = {
                        DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5738"),
                },
        },
-       {
-               /* Lenovo ThinkPad Twist S230u */
-               .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "33474HU"),
-               },
-       },
        { }
 };