Input: i8042 - use new forcenorestore quirk to replace old buggy quirk combination

The old quirk combination sometimes cause a laggy keyboard after boot. With
the new quirk the initial issue of an unresponsive keyboard after s3 resume
is also fixed, but it doesn't have the negative side effect of the
sometimes laggy keyboard.

Signed-off-by: Werner Sembach <[email protected]>
Cc: [email protected]
Reviewed-by: Hans de Goede <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Dmitry Torokhov <[email protected]>

diff --git a/drivers/input/serio/i8042-acpipnpio.h b/drivers/input/serio/i8042-acpipnpio.h
index 00e8043010887276571a51246be342ac432ed0a3..bad238f69a7afd8f73a101a95eb57b898f9e4b22 100644 (file)
--- a/drivers/input/serio/i8042-acpipnpio.h
+++ b/drivers/input/serio/i8042-acpipnpio.h
@@ -1159,18 +1159,10 @@ static const struct dmi_system_id i8042_dmi_quirk_table[] __initconst = {
                                        SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
        },
        {
-               /*
-                * Setting SERIO_QUIRK_NOMUX or SERIO_QUIRK_RESET_ALWAYS makes
-                * the keyboard very laggy for ~5 seconds after boot and
-                * sometimes also after resume.
-                * However both are required for the keyboard to not fail
-                * completely sometimes after boot or resume.
-                */
                .matches = {
                        DMI_MATCH(DMI_BOARD_NAME, "N150CU"),
                },
-               .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
-                                       SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP)
+               .driver_data = (void *)(SERIO_QUIRK_FORCENORESTORE)
        },
        {
                .matches = {