[PATCH 1/4] Fix MUX mode disabling.

Vojtech Pavlik
2005-02-02T20:19:08Z

ChangeSet@1.1977.1.1, 2005-01-28 21:11:52+01:00, vojtech@silver.ucw.cz
input: Fix MUX mode disabling.

Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>

i8042.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)

===================================================================

diff -Nru a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
--- a/drivers/input/serio/i8042.c 2005-02-02 20:29:55 +01:00
+++ b/drivers/input/serio/i8042.c 2005-02-02 20:29:55 +01:00
@@ -482,7 +482,7 @@
if (i8042_command(&param, I8042_CMD_AUX_LOOP) || param != 0x0f)
return -1;
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;
param = mode ? 0xa4 : 0xa5;
if (i8042_command(&param, I8042_CMD_AUX_LOOP) || param == (mode ? 0x5b : 0x5a))
@@ -787,7 +787,8 @@
* 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.