summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor_core@ameritech.net>2005-09-24 09:02:29 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-24 19:44:25 +0200
commitff13f98b97cb6c5a2d201dfa4db0a2fd0b4d9d50 (patch)
treebce3878acb3cafa95267bb1c95bb5031e7b52e79 /drivers/input
parentMerge branch 'upstream' from master.kernel.org:/pub/scm/linux/kernel/git/jgar... (diff)
downloadlinux-ff13f98b97cb6c5a2d201dfa4db0a2fd0b4d9d50.tar.xz
linux-ff13f98b97cb6c5a2d201dfa4db0a2fd0b4d9d50.zip
[PATCH] Input: check switch bitmap when matching handlers
The wwitch bitmap was added to input_device_id structure and we should check it when matching handlers and input devices. Signed-off-by: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/input.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/input.c b/drivers/input/input.c
index 88636a204525..14ae5583e198 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -308,6 +308,7 @@ static struct input_device_id *input_match_device(struct input_device_id *id, st
MATCH_BIT(ledbit, LED_MAX);
MATCH_BIT(sndbit, SND_MAX);
MATCH_BIT(ffbit, FF_MAX);
+ MATCH_BIT(swbit, SW_MAX);
return id;
}