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

jwrdegoede · dtor · commit 9cf6e24c9fbf · 2024-02-01T20:48:52.000-08:00
After commit 936e4d4 ("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 be2d7e4 ("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: 936e4d4 ("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>
diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
@@ -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.

Original file line number	Diff line number	Diff line change
`@@ -826,7 +826,7 @@ static int atkbd_probe(struct atkbd *atkbd)`
`826`	`826`
`827`	`827`	`if (atkbd_skip_getid(atkbd)) {`
`828`	`828`	`atkbd->id = 0xab83;`
`829`		`- return 0;`
	`829`	`+ goto deactivate_kbd;`
`830`	`830`	`}`
`831`	`831`
`832`	`832`	`/*`
`@@ -863,6 +863,7 @@ static int atkbd_probe(struct atkbd *atkbd)`
`863`	`863`	`return -1;`
`864`	`864`	`}`
`865`	`865`
	`866`	`+deactivate_kbd:`
`866`	`867`	`/*`
`867`	`868`	`* Make sure nothing is coming from the keyboard and disturbs our`
`868`	`869`	`* internal state.`