Skip to contentSkip to conversation

- Three more input fixes for 2.6.11

PATCH Superseded Vojtech Pavlik 1 participant 4 messages Jan 29, 2005

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover - Three more input fixes for 2.6.11

Hi!

The previous set introduced one bug, mostly harmless, but pretty annoying - the hid-input driver fills the logs with the 'event field not found' message. I'm sorry for that, I just tested that the patch does what it should and didn't check the logs.

The last of these three patches fixes that.

The first fixes the MUX disabling routine in i8042 to really do something on reboot, and the second patch from Andries adds a documentation entry for atkbd.softraw.

Please include them before 2.6.11, as the bug described above would cause a lot of e-mails to be sent to me.

The patches are available at

bk://kernel.bkbits.net/vojtech/for-linus

Signature · 2 lines
Vojtech Pavlik
SuSE Labs, SuSE CR
#1 lore raw

PATCH 1/3 Fix MUX mode disabling.

You can pull this changeset from:
bk://kernel.bkbits.net/vojtech/for-linus

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

[email protected], 2005-01-28 21:11:52+01:00, [email protected]
input: Fix MUX mode disabling.

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

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

drivers/input/serio/i8042.c +3 -2
diff -Nru a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
@@ -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.
#2 lore raw

PATCH 2/3 Document the atkbd.softraw module parameter.

You can pull this changeset from:
bk://kernel.bkbits.net/vojtech/for-linus

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

[email protected], 2005-01-29 12:27:56+01:00, [email protected]
input: Document the atkbd.softraw module parameter.

From: Andries Brouwer <[email protected]>

 kernel-parameters.txt |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

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

Documentation/kernel-parameters.txt +7 -3
diff -Nru a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
@@ -226,15 +226,19 @@
 
 	atascsi=	[HW,SCSI] Atari SCSI
 
-	atkbd.extra=	[HW] Enable extra LEDs and keys on IBM RapidAccess, EzKey
-			and similar keyboards
+	atkbd.extra=	[HW] Enable extra LEDs and keys on IBM RapidAccess,
+			EzKey and similar keyboards
 
 	atkbd.reset=	[HW] Reset keyboard during initialization
 
 	atkbd.set=	[HW] Select keyboard code set 
 			Format: <int> (2 = AT (default) 3 = PS/2)
 
-	atkbd.scroll=	[HW] Enable scroll wheel on MS Office and similar keyboards
+	atkbd.scroll=	[HW] Enable scroll wheel on MS Office and similar
+			keyboards
+
+	atkbd.softraw=	[HW] Choose between synthetic and real raw mode
+			Format: <bool> (0 = real, 1 = synthetic (default))
 	
 	atkbd.softrepeat=
 			[HW] Use software keyboard repeat
#3 lore raw

PATCH 3/3 Fix 'event field not found' message filling logs

You can pull this changeset from:
bk://kernel.bkbits.net/vojtech/for-linus

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

[email protected], 2005-01-29 13:09:24+01:00, [email protected]
input: Ignore non-LED events in hid-input hidinput_event(). This gets rid
of the "event field not found" message caused by EV_MSC type events.

 hid-input.c |    3 +++
 1 files changed, 3 insertions(+)

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

drivers/usb/input/hid-input.c +3 -0
diff -Nru a/drivers/usb/input/hid-input.c b/drivers/usb/input/hid-input.c
@@ -492,6 +492,9 @@
 	if (type == EV_FF)
 		return hid_ff_event(hid, dev, type, code, value);
 
+	if (type != EV_LED)
+		return -1;
+
 	if ((offset = hid_find_field(hid, type, code, &field)) == -1) {
 		warn("event field not found");
 		return -1;