Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (30 commits)
  Revert "HID: add support for the Wacom Intuos 4 wireless"
  HID: fix up Kconfig entry for ACRUX driver
  HID: add ACRUX game controller force feedback support
  HID: Force input registration for "VEC footpedal"
  HID: add HID_QUIRK_HIDINPUT_FORCE
  HID: hid-input.c: indentation fixes
  HID: hiddev: use usb_find_interface, get rid of BKL
  HID: ignore digitizer usage Undefined (0x00)
  HID: Add support for Conceptronic CLLRCMCE
  HID: hid-ids.h: Whitespace fixup, align using TABs
  HID: picolcd: implement refcounting of framebuffer
  HID: picolcd: do not reallocate memory on depth change
  HID: picolcd: Add minimal palette required by fbcon on 8bpp
  HID: magicmouse: Correct parsing of large X and Y motions.
  HID: magicmouse: report last touch up
  HID: picolcd: fix deferred_io init/cleanup to fb ordering
  HID: hid-ids.h: keep vendor ids in alphabetical order
  HID: add proper support for Elecom BM084 bluetooth mouse
  HID: magicmouse: enable horizontal scrolling
  HID: magicmouse: add param for scroll speed
  ...

1 files changed, 12 insertions, 9 deletions

diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index 69d152e16a6a..6c03dcc5760a 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
                 case HID_GD_MOUSE:
                 case HID_GD_POINTER:  code += 0x110; break;
                 case HID_GD_JOYSTICK:
-                                      if (code <= 0xf)
-                                              code += BTN_JOYSTICK;
-                                      else
-                                              code += BTN_TRIGGER_HAPPY;
-                                      break;
+                                if (code <= 0xf)
+                                        code += BTN_JOYSTICK;
+                                else
+                                        code += BTN_TRIGGER_HAPPY;
+                                break;
                 case HID_GD_GAMEPAD:  code += 0x130; break;
                 default:
                         switch (field->physical) {
@@ -301,6 +301,9 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
 
         case HID_UP_DIGITIZER:
                 switch (usage->hid & 0xff) {
+                case 0x00: /* Undefined */
+                        goto ignore;
+
                 case 0x30: /* TipPressure */
                         if (!test_bit(BTN_TOUCH, input->keybit)) {
                                 device->quirks |= HID_QUIRK_NOTOUCH;
@@ -480,7 +483,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
 
         case HID_UP_LOGIVENDOR:
                 goto ignore;
-        
+
         case HID_UP_PID:
                 switch (usage->hid & HID_USAGE) {
                 case 0xa4: map_key_clear(BTN_DEAD);     break;
@@ -589,9 +592,9 @@ void hidinput_hid_event(struct hid_device *hid, struct hid_field *field, struct
                         hat_dir = (value - usage->hat_min) * 8 / (usage->hat_max - usage->hat_min + 1) + 1;
                 if (hat_dir < 0 || hat_dir > 8) hat_dir = 0;
                 input_event(input, usage->type, usage->code    , hid_hat_to_axis[hat_dir].x);
-                input_event(input, usage->type, usage->code + 1, hid_hat_to_axis[hat_dir].y);
-                return;
-        }
+                input_event(input, usage->type, usage->code + 1, hid_hat_to_axis[hat_dir].y);
+                return;
+        }
 
         if (usage->hid == (HID_UP_DIGITIZER | 0x003c)) { /* Invert */
                 *quirks = value ? (*quirks | HID_QUIRK_INVERT) : (*quirks & ~HID_QUIRK_INVERT);