aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/hid-input.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index d917c0d53685..10248cf548fc 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -502,9 +502,14 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
502 if (code <= 0xf) 502 if (code <= 0xf)
503 code += BTN_JOYSTICK; 503 code += BTN_JOYSTICK;
504 else 504 else
505 code += BTN_TRIGGER_HAPPY; 505 code += BTN_TRIGGER_HAPPY - 0x10;
506 break;
507 case HID_GD_GAMEPAD:
508 if (code <= 0xf)
509 code += BTN_GAMEPAD;
510 else
511 code += BTN_TRIGGER_HAPPY - 0x10;
506 break; 512 break;
507 case HID_GD_GAMEPAD: code += BTN_GAMEPAD; break;
508 default: 513 default:
509 switch (field->physical) { 514 switch (field->physical) {
510 case HID_GD_MOUSE: 515 case HID_GD_MOUSE: