Commit 9cf6e24c authored by Hans de Goede's avatar Hans de Goede Committed by Dmitry Torokhov
Browse files

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



After commit 936e4d49 ("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 be2d7e42 ("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: 936e4d49 ("Input: atkbd - skip ATKBD_CMD_GETID in translated mode")
Tested-by: default avatarPaul Menzel <pmenzel@molgen.mpg.de>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20240126160724.13278-3-hdegoede@redhat.com


Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 683cd825

drivers/input/keyboard/atkbd.c

+2 −1
Original line number Diff line number Diff line
@@ -826,7 +826,7 @@ static int atkbd_probe(struct atkbd *atkbd) 


	if (atkbd_skip_getid(atkbd)) {

		atkbd->id = 0xab83;

		return 0;

		goto deactivate_kbd;

	}



/*
@@ -863,6 +863,7 @@ static int atkbd_probe(struct atkbd *atkbd) 
		return -1;

	}



deactivate_kbd:

/*

 * Make sure nothing is coming from the keyboard and disturbs our

 * internal state.