Merge branches 'upstream-fixes', 'wacom' and 'waltop' into for-linus

[karo-tx-linux.git] / drivers / hid / hid-input.c

diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index 22d8ce6d5a597d18e54172add34a46cabdd3d7ac..132b0019365eed9057eeaaf0a3b222eece0853ad 100644 (file)
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -657,10 +657,6 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                        map_key_clear(BTN_STYLUS2);
                        break;
 
-               case 0x51: /* ContactID */
-                       device->quirks |= HID_QUIRK_MULTITOUCH;
-                       goto unknown;
-
                default:  goto unknown;
                }
                break;
@@ -1227,13 +1223,6 @@ int hidinput_connect(struct hid_device *hid, unsigned int force)
                }
        }
 
-       if (hid->quirks & HID_QUIRK_MULTITOUCH) {
-               /* generic hid does not know how to handle multitouch devices */
-               if (hidinput)
-                       goto out_cleanup;
-               goto out_unwind;
-       }
-
        if (hidinput && input_register_device(hidinput->input))
                goto out_cleanup;