Merge branch 'for-upstream/mali-dp' of git://linux-arm.org/linux-ld into drm-next

[cascardo/linux.git] / drivers / hid / hid-penmount.c

diff --git a/drivers/hid/hid-penmount.c b/drivers/hid/hid-penmount.c
index c11dce8..d90383f 100644 (file)
--- a/drivers/hid/hid-penmount.c
+++ b/drivers/hid/hid-penmount.c
@@ -23,8 +23,12 @@ static int penmount_input_mapping(struct hid_device *hdev,
                struct hid_usage *usage, unsigned long **bit, int *max)
 {
        if ((usage->hid & HID_USAGE_PAGE) == HID_UP_BUTTON) {
-               hid_map_usage(hi, usage, bit, max, EV_KEY, BTN_TOUCH);
-               return 1;
+               if (((usage->hid - 1) & HID_USAGE) == 0) {
+                       hid_map_usage(hi, usage, bit, max, EV_KEY, BTN_TOUCH);
+                       return 1;
+               } else {
+                       return -1;
+               }
        }
 
        return 0;