github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-22 04:34:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Input: atkbd - do not skip atkbd_deactivate() when skipping ATKBD_CMD_GETID

Browse Source 
After commit 936e4d49ec ("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 be2d7e4233 ("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: 936e4d49ec ("Input: atkbd - skip ATKBD_CMD_GETID in translated mode")
Tested-by: Paul Menzel <pmenzel@molgen.mpg.de>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20240126160724.13278-3-hdegoede@redhat.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Hans de Goede 2024-01-26 17:07:24 +01:00 committed by Dmitry Torokhov
parent 683cd8259a
commit 9cf6e24c9f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/input/keyboard/atkbd.c
View File

@ -826,7 +826,7 @@ static int atkbd_probe(struct atkbd *atkbd)
if (atkbd_skip_getid(atkbd)) { if (atkbd_skip_getid(atkbd)) {
atkbd->id = 0xab83; atkbd->id = 0xab83;
return 0; goto deactivate_kbd;
} }
/* /*
@ -863,6 +863,7 @@ static int atkbd_probe(struct atkbd *atkbd)
return -1; return -1;
} }
deactivate_kbd:
/* /*
* Make sure nothing is coming from the keyboard and disturbs our * Make sure nothing is coming from the keyboard and disturbs our
* internal state. * internal state.