Skip to content

L
linux
Commit 40d0d67c authored by Vojtech Pavlik's avatar Vojtech Pavlik
Browse files
Options

input: Fix MUX mode disabling. 

Signed-off-by: default avatarVojtech Pavlik <vojtech@suse.cz>
parent df56a4a6
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
drivers/input/serio/i8042.c
View file @ 40d0d67c
...@@ -482,7 +482,7 @@ static int i8042_set_mux_mode(unsigned int mode, unsigned char *mux_version) ...@@ -482,7 +482,7 @@ static int i8042_set_mux_mode(unsigned int mode, unsigned char *mux_version)
if (i8042_command(&param, I8042_CMD_AUX_LOOP) || param != 0x0f) if (i8042_command(&param, I8042_CMD_AUX_LOOP) || param != 0x0f)
return -1; return -1;
param = mode ? 0x56 : 0xf6; param = mode ? 0x56 : 0xf6;
if (i8042_command(&param, I8042_CMD_AUX_LOOP) || param != 0xa9) if (i8042_command(&param, I8042_CMD_AUX_LOOP) || param != (mode ? 0xa9 : 0x09))
return -1; return -1;
param = mode ? 0xa4 : 0xa5; param = mode ? 0xa4 : 0xa5;
if (i8042_command(&param, I8042_CMD_AUX_LOOP) || param == (mode ? 0x5b : 0x5a)) if (i8042_command(&param, I8042_CMD_AUX_LOOP) || param == (mode ? 0x5b : 0x5a))
...@@ -787,7 +787,8 @@ void i8042_controller_reset(void) ...@@ -787,7 +787,8 @@ void i8042_controller_reset(void)
* Disable MUX mode if present. * Disable MUX mode if present.
*/ */
i8042_set_mux_mode(0, NULL); if (i8042_mux_present)
i8042_set_mux_mode(0, NULL);
/* /*
* Restore the original control register setting. * Restore the original control register setting.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7