Needed input fixes for 2.6.11
Subsystems (3)
PATCH RESEND 1/1 Needed input fixes for 2.6.11
Hi!
I pretty much screwed up in the last update you merged for 2.6.11, making USB input devices rather annoying to use. These four patches fix the damage made:
1) The MUX mode disabling had a bug that caused it to not work at all.
2) MSC_SCAN events backpropagating into hid-input.c caused a flood of 'event field not found' messages in the syslog.
3) USB keyboad LEDs stopped working due to a fix for Logitech mouse fake LEDs.
4) The fourth patch is a documentation update from Andries Brouwer.
Please include these before the final 2.6.11, or drop the last input update.
As usual, they're available at:
bk://kernel.bkbits.net/vojtech/for-linus
as well as in the following mails of this thread.
Thanks,
Signature · 2 lines
Vojtech Pavlik SuSE Labs, SuSE CR
PATCH 1/4 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
@@ -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.
PATCH 2/4 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
@@ -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
PATCH 3/4 Ignore non-LED events in hid-input hidinput_event().
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
@@ -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 ;
PATCH 4/4 Fix HID LED mapping.
You can pull this changeset from:
bk://kernel.bkbits.net/vojtech/for-linus
===================================================================
[email protected], 2005-02-02 17:54:35+01:00, [email protected]
input: Fix HID LED mapping. LEDs were ignored because the usage
value contains the page code in high 16 bits.
hid-debug.h | 2 +- hid-input.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
===================================================================
drivers/usb/input/hid-debug.h +1 -1
@@ -86,12 +86,12 @@ {0, 0x92, "D-PadRight"}, {0, 0x93, "D-PadLeft"}, { 7, 0, "Keyboard" }, + { 8, 0, "LED" }, {0, 0x01, "NumLock"}, {0, 0x02, "CapsLock"}, {0, 0x03, "ScrollLock"}, {0, 0x04, "Compose"}, {0, 0x05, "Kana"}, - { 8, 0, "LED" }, { 9, 0, "Button" }, { 10, 0, "Ordinal" }, { 12, 0, "Consumer" },
drivers/usb/input/hid-input.c +2 -2
@@ -185,9 +185,9 @@break ;case HID_UP_LED : -if (usage->hid -1 >=LED_MAX ) +if (((usage->hid -1 ) &0xffff ) >=LED_MAX ) goto ignore; -map_led (usage->hid -1 ); +map_led ((usage->hid -1 ) &0xffff );break ;case HID_UP_DIGITIZER :