[bk-patches] [resend] Needed input fixes for 2.6.11

[bk-patches] [resend] Needed input fixes for 2.6.11

[Vojtech Pavlik]

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,
-- 
Vojtech Pavlik
SuSE Labs, SuSE CR

[PATCH 1/4] Fix MUX mode disabling.

[Vojtech Pavlik]

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-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.

[PATCH 2/4] Document the atkbd.softraw module parameter.

[Vojtech Pavlik]

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

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

ChangeSet@1.1977.1.2, 2005-01-29 12:27:56+01:00, Andries.Brouwer@cwi.nl
  input: Document the atkbd.softraw module parameter.
  
  From: Andries Brouwer <Andries.Brouwer@cwi.nl>
  Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>


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

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

diff -Nru a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
--- a/Documentation/kernel-parameters.txt	2005-02-02 20:29:48 +01:00
+++ b/Documentation/kernel-parameters.txt	2005-02-02 20:29:48 +01:00
@@ -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 4/4] Fix HID LED mapping.

[Vojtech Pavlik]

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

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

ChangeSet@1.1994, 2005-02-02 17:54:35+01:00, vojtech@silver.ucw.cz
  input: Fix HID LED mapping. LEDs were ignored because the usage
         value contains the page code in high 16 bits.
  
  Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>


 hid-debug.h |    2 +-
 hid-input.c |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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

diff -Nru a/drivers/usb/input/hid-debug.h b/drivers/usb/input/hid-debug.h
--- a/drivers/usb/input/hid-debug.h	2005-02-02 20:29:32 +01:00
+++ b/drivers/usb/input/hid-debug.h	2005-02-02 20:29:32 +01:00
@@ -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" },
diff -Nru a/drivers/usb/input/hid-input.c b/drivers/usb/input/hid-input.c
--- a/drivers/usb/input/hid-input.c	2005-02-02 20:29:32 +01:00
+++ b/drivers/usb/input/hid-input.c	2005-02-02 20:29:32 +01:00
@@ -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:

[PATCH 3/4] Ignore non-LED events in hid-input hidinput_event().

[Vojtech Pavlik]

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

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

ChangeSet@1.1977.1.3, 2005-01-29 13:09:24+01:00, vojtech@silver.ucw.cz
  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.
  
  Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>


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

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

diff -Nru a/drivers/usb/input/hid-input.c b/drivers/usb/input/hid-input.c
--- a/drivers/usb/input/hid-input.c	2005-02-02 20:29:40 +01:00
+++ b/drivers/usb/input/hid-input.c	2005-02-02 20:29:40 +01:00
@@ -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;