HID: fix incorrect handling of devices with high button count
authorIngo Ruhnke <grumbel@gmail.com>
Mon, 29 Oct 2012 13:29:30 +0000 (14:29 +0100)
committerJiri Kosina <jkosina@suse.cz>
Wed, 31 Oct 2012 15:03:32 +0000 (16:03 +0100)
commitf8e86d054686d9090549476ea2394aa04c614a93
tree555d07a600ea98f6569ac0dfd6200c33183c697f
parentc10354d4a6c9256c3393feafcbd030cb392a9baf
HID: fix incorrect handling of devices with high button count

Button names for USB gamepads are currently assigned incorrectly, as the evdev
code assigned to buttons is "BTN_GAMEPAD + code", which on devices with more
then 16 buttons bleeds over into button names reserved for graphic tablets
(BTN_TOOL_PEN, etc.). This causes problems further down the line as the device
are now no longer detected as joystick. This patch fixes that by assigning
buttons outside the range to BTN_TRIGGER_HAPPY (as is already the case for USB
joysticks).

Furthermore this patch corrects the assignment to BTN_TRIGGER_HAPPY, as
currently the first button over 16 is assigned to BTN_TRIGGER_HAPPY17 (i.e.
BTN_TRIGGER_HAPPY+0x10) not BTN_TRIGGER_HAPPY.

Signed-off-by: Ingo Ruhnke <grumbel@gmail.com>
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
drivers/hid/hid-input.c