diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2017-01-11 22:19:31 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2017-01-11 22:19:31 +0100 |
| commit | b7244b40fd41685b7b52e7d9cce4f98c813d1c74 (patch) | |
| tree | 16b8dc3f3bb415b96d5dc4e66e99a2d72abc6919 /drivers/hid/hid-core.c | |
| parent | f7fd95d77c555afee134800c5409ce40336071d9 (diff) | |
| parent | c7821d0f3d81ef91aff037cef4e23c56bab30d26 (diff) | |
Merge branch 'for-4.11/rmi' into for-next
Diffstat (limited to 'drivers/hid/hid-core.c')
| -rw-r--r-- | drivers/hid/hid-core.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 2ad8fdc9cd03..9905455bb5c5 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -822,7 +822,8 @@ static int hid_scan_report(struct hid_device *hid) hid->group = HID_GROUP_WACOM; break; case USB_VENDOR_ID_SYNAPTICS: - if (hid->group == HID_GROUP_GENERIC) + if (hid->group == HID_GROUP_GENERIC || + hid->group == HID_GROUP_MULTITOUCH_WIN_8) if ((parser->scan_flags & HID_SCAN_FLAG_VENDOR_SPECIFIC) && (parser->scan_flags & HID_SCAN_FLAG_GD_POINTER)) /* @@ -2122,6 +2123,7 @@ static const struct hid_device_id hid_have_special_driver[] = { { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO, USB_DEVICE_ID_NINTENDO_WIIMOTE2) }, { HID_USB_DEVICE(USB_VENDOR_ID_RAZER, USB_DEVICE_ID_RAZER_BLADE_14) }, { HID_USB_DEVICE(USB_VENDOR_ID_CMEDIA, USB_DEVICE_ID_CM6533) }, + { HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_X1_COVER) }, { } }; |