From: Vojtech Pavlik <vojtech@suse.cz>
To: torvalds@osdl.org, vojtech@ucw.cz, linux-kernel@vger.kernel.org
Subject: [PATCH 1/3] Fix MUX mode disabling.
Date: Sat, 29 Jan 2005 17:45:28 +0100 [thread overview]
Message-ID: <1107017128686@twilight.ucw.cz> (raw)
In-Reply-To: <20050129164450.GA14053@ucw.cz>
You can pull this changeset from:
bk://kernel.bkbits.net/vojtech/for-linus
===================================================================
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-01-29 17:37:27 +01:00
+++ b/drivers/input/serio/i8042.c 2005-01-29 17:37:27 +01:00
@@ -482,7 +482,7 @@
if (i8042_command(¶m, I8042_CMD_AUX_LOOP) || param != 0x0f)
return -1;
param = mode ? 0x56 : 0xf6;
- if (i8042_command(¶m, I8042_CMD_AUX_LOOP) || param != 0xa9)
+ if (i8042_command(¶m, I8042_CMD_AUX_LOOP) || param != (mode ? 0xa9 : 0x09))
return -1;
param = mode ? 0xa4 : 0xa5;
if (i8042_command(¶m, 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.
next prev parent reply other threads:[~2005-01-29 19:08 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-01-29 16:44 [PATCH 0/3] - Three more input fixes for 2.6.11 Vojtech Pavlik
2005-01-29 16:45 ` Vojtech Pavlik [this message]
2005-01-29 16:45 ` [PATCH 2/3] Document the atkbd.softraw module parameter Vojtech Pavlik
2005-01-29 16:45 ` [PATCH 3/3] Fix 'event field not found' message filling logs Vojtech Pavlik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1107017128686@twilight.ucw.cz \
--to=vojtech@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@osdl.org \
--cc=vojtech@ucw.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.