diff options
-rw-r--r-- | drivers/hid/hid-input.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c index 7a0d2e4661a1..36c214877f77 100644 --- a/drivers/hid/hid-input.c +++ b/drivers/hid/hid-input.c | |||
@@ -199,11 +199,11 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel | |||
199 | case HID_GD_MOUSE: | 199 | case HID_GD_MOUSE: |
200 | case HID_GD_POINTER: code += 0x110; break; | 200 | case HID_GD_POINTER: code += 0x110; break; |
201 | case HID_GD_JOYSTICK: | 201 | case HID_GD_JOYSTICK: |
202 | if (code <= 0xf) | 202 | if (code <= 0xf) |
203 | code += BTN_JOYSTICK; | 203 | code += BTN_JOYSTICK; |
204 | else | 204 | else |
205 | code += BTN_TRIGGER_HAPPY; | 205 | code += BTN_TRIGGER_HAPPY; |
206 | break; | 206 | break; |
207 | case HID_GD_GAMEPAD: code += 0x130; break; | 207 | case HID_GD_GAMEPAD: code += 0x130; break; |
208 | default: | 208 | default: |
209 | switch (field->physical) { | 209 | switch (field->physical) { |
@@ -480,7 +480,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel | |||
480 | 480 | ||
481 | case HID_UP_LOGIVENDOR: | 481 | case HID_UP_LOGIVENDOR: |
482 | goto ignore; | 482 | goto ignore; |
483 | 483 | ||
484 | case HID_UP_PID: | 484 | case HID_UP_PID: |
485 | switch (usage->hid & HID_USAGE) { | 485 | switch (usage->hid & HID_USAGE) { |
486 | case 0xa4: map_key_clear(BTN_DEAD); break; | 486 | case 0xa4: map_key_clear(BTN_DEAD); break; |
@@ -586,9 +586,9 @@ void hidinput_hid_event(struct hid_device *hid, struct hid_field *field, struct | |||
586 | hat_dir = (value - usage->hat_min) * 8 / (usage->hat_max - usage->hat_min + 1) + 1; | 586 | hat_dir = (value - usage->hat_min) * 8 / (usage->hat_max - usage->hat_min + 1) + 1; |
587 | if (hat_dir < 0 || hat_dir > 8) hat_dir = 0; | 587 | if (hat_dir < 0 || hat_dir > 8) hat_dir = 0; |
588 | input_event(input, usage->type, usage->code , hid_hat_to_axis[hat_dir].x); | 588 | input_event(input, usage->type, usage->code , hid_hat_to_axis[hat_dir].x); |
589 | input_event(input, usage->type, usage->code + 1, hid_hat_to_axis[hat_dir].y); | 589 | input_event(input, usage->type, usage->code + 1, hid_hat_to_axis[hat_dir].y); |
590 | return; | 590 | return; |
591 | } | 591 | } |
592 | 592 | ||
593 | if (usage->hid == (HID_UP_DIGITIZER | 0x003c)) { /* Invert */ | 593 | if (usage->hid == (HID_UP_DIGITIZER | 0x003c)) { /* Invert */ |
594 | *quirks = value ? (*quirks | HID_QUIRK_INVERT) : (*quirks & ~HID_QUIRK_INVERT); | 594 | *quirks = value ? (*quirks | HID_QUIRK_INVERT) : (*quirks & ~HID_QUIRK_INVERT); |