From: Greg Kroah-Hartman Date: Tue, 15 Jul 2025 09:02:21 +0000 (+0200) Subject: 6.6-stable patches X-Git-Tag: v5.4.296~26 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=375be5f8e9888b965e4e9d19478dbfb7f913070a;p=thirdparty%2Fkernel%2Fstable-queue.git 6.6-stable patches added patches: input-atkbd-do-not-skip-atkbd_deactivate-when-skipping-atkbd_cmd_getid.patch --- diff --git a/queue-6.6/input-atkbd-do-not-skip-atkbd_deactivate-when-skipping-atkbd_cmd_getid.patch b/queue-6.6/input-atkbd-do-not-skip-atkbd_deactivate-when-skipping-atkbd_cmd_getid.patch new file mode 100644 index 0000000000..badf9d9b66 --- /dev/null +++ b/queue-6.6/input-atkbd-do-not-skip-atkbd_deactivate-when-skipping-atkbd_cmd_getid.patch @@ -0,0 +1,48 @@ +From 9cf6e24c9fbf17e52de9fff07f12be7565ea6d61 Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Fri, 26 Jan 2024 17:07:24 +0100 +Subject: Input: atkbd - do not skip atkbd_deactivate() when skipping ATKBD_CMD_GETID + +From: Hans de Goede + +commit 9cf6e24c9fbf17e52de9fff07f12be7565ea6d61 upstream. + +After commit 936e4d49ecbc ("Input: atkbd - skip ATKBD_CMD_GETID in +translated mode") not only the getid command is skipped, but also +the de-activating of the keyboard at the end of atkbd_probe(), potentially +re-introducing the problem fixed by commit be2d7e4233a4 ("Input: atkbd - +fix multi-byte scancode handling on reconnect"). + +Make sure multi-byte scancode handling on reconnect is still handled +correctly by not skipping the atkbd_deactivate() call. + +Fixes: 936e4d49ecbc ("Input: atkbd - skip ATKBD_CMD_GETID in translated mode") +Tested-by: Paul Menzel +Signed-off-by: Hans de Goede +Link: https://lore.kernel.org/r/20240126160724.13278-3-hdegoede@redhat.com +Signed-off-by: Dmitry Torokhov +Signed-off-by: Wang Hai +Signed-off-by: Greg Kroah-Hartman +--- + drivers/input/keyboard/atkbd.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/input/keyboard/atkbd.c ++++ b/drivers/input/keyboard/atkbd.c +@@ -826,7 +826,7 @@ static int atkbd_probe(struct atkbd *atk + + if (atkbd_skip_getid(atkbd)) { + atkbd->id = 0xab83; +- return 0; ++ goto deactivate_kbd; + } + + /* +@@ -863,6 +863,7 @@ static int atkbd_probe(struct atkbd *atk + return -1; + } + ++deactivate_kbd: + /* + * Make sure nothing is coming from the keyboard and disturbs our + * internal state. diff --git a/queue-6.6/series b/queue-6.6/series index 66c011f8a8..d4273ea265 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -102,3 +102,4 @@ vt-add-missing-notification-when-switching-back-to-t.patch bpf-adjust-free-target-to-avoid-global-starvation-of.patch hid-add-ignore-quirk-for-smartlinktechnology.patch hid-quirks-add-quirk-for-2-chicony-electronics-hp-5m.patch +input-atkbd-do-not-skip-atkbd_deactivate-when-skipping-atkbd_cmd_getid.patch