summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVojtech Pavlik <vojtech@suse.cz>2005-05-28 02:11:42 -0500
committerDmitry Torokhov <dtor_core@ameritech.net>2005-05-28 02:11:42 -0500
commit7741e9317137a7456baa9c09ad8308c80c23b8db (patch)
tree31956504c90efb020a7b449f14b1b33532437f00
parent74af42bb729651855f78ea27498250724689130e (diff)
downloadlinux-stable-7741e9317137a7456baa9c09ad8308c80c23b8db.tar.gz
linux-stable-7741e9317137a7456baa9c09ad8308c80c23b8db.tar.bz2
linux-stable-7741e9317137a7456baa9c09ad8308c80c23b8db.zip
Input: Workaround for Sunrex K8561 IR Keyboard/Mouse. The mouse
sends an incorrect ID and wasn't recognized. Reported-by: Stefan Seyfried <seife@suse.de> Signed-off-by: Vojtech Pavlik <vojtech@suse.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
-rw-r--r--drivers/input/mouse/psmouse-base.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
index c9f8e16ca578..019034b21a0b 100644
--- a/drivers/input/mouse/psmouse-base.c
+++ b/drivers/input/mouse/psmouse-base.c
@@ -518,13 +518,16 @@ static int psmouse_probe(struct psmouse *psmouse)
/*
* First, we check if it's a mouse. It should send 0x00 or 0x03
* in case of an IntelliMouse in 4-byte mode or 0x04 for IM Explorer.
+ * Sunrex K8561 IR Keyboard/Mouse reports 0xff on second and subsequent
+ * ID queries, probably due to a firmware bug.
*/
param[0] = 0xa5;
if (ps2_command(ps2dev, param, PSMOUSE_CMD_GETID))
return -1;
- if (param[0] != 0x00 && param[0] != 0x03 && param[0] != 0x04)
+ if (param[0] != 0x00 && param[0] != 0x03 &&
+ param[0] != 0x04 && param[0] != 0xff)
return -1;
/*