aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/keyboard
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor@insightbb.com>2006-09-14 01:31:27 -0400
committerDmitry Torokhov <dtor@insightbb.com>2006-09-14 01:31:27 -0400
commit9807879bfdc0c2b5106b4b378f5475c6a333d853 (patch)
tree2a761ae4d03b35e371044014af4addcc23f326da /drivers/input/keyboard
parenta91eaa16df5cd6c552e3a4a6e40e60ffbd9be951 (diff)
Input: atkbd - support Microsoft Natural Elite Pro keyboards
Microsoft Natural Elite Pro keyboard produces unisual response to the GET ID command - single byte 0xaa (normally keyboards produce 2-byte response). Fail GET ID command so atkbd gets a change to do alternate probe. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/keyboard')
-rw-r--r--drivers/input/keyboard/atkbd.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
index ce1f10e8984b..9874072cf9d6 100644
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
@@ -635,9 +635,7 @@ static int atkbd_probe(struct atkbd *atkbd)
635 return 0; 635 return 0;
636 } 636 }
637 637
638 if (param[0] != 0xab && param[0] != 0xac && /* Regular and NCD Sun keyboards */ 638 if (!ps2_is_keyboard_id(param[0]))
639 param[0] != 0x2b && param[0] != 0x5d && /* Trust keyboard, raw and translated */
640 param[0] != 0x60 && param[0] != 0x47) /* NMB SGI keyboard, raw and translated */
641 return -1; 639 return -1;
642 640
643 atkbd->id = (param[0] << 8) | param[1]; 641 atkbd->id = (param[0] << 8) | param[1];