Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit b81fd5ba6002306f0c2bf82514b2eeae6ee2bf32

Authored by Linus Torvalds
2 parents 2f3e12bd9c e24d0d399b
Exists in master and in 13 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.15.y, ti-lsk-linux-4.1.y

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

Pull HID fixes from Jiri Kosina:
 - fix for merge window mismerge in hid-sony, from Frank Praznik
 - fix for Surface Type/Touch Cover 2 device, from Benjamin Tissoires
 - quirk for ThinkPad Helix sensor hub from Stephen Chandler Paul

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: core: do not scan constant input report
  Revert "HID: microsoft: Add ID's for Surface Type/Touch Cover 2"
  HID: sensor-hub: add sensor hub quirk for ThinkPad Helix
  HID: sony: Fix cancel_work_sync mismerge

Showing 5 changed files Side-by-side Diff

drivers/hid/hid-core.c
Diff comments   View file @ b81fd5b
... ... @@ -718,6 +718,9 @@
718 718 case HID_MAIN_ITEM_TAG_END_COLLECTION:
719 719 break;
720 720 case HID_MAIN_ITEM_TAG_INPUT:
  721 + /* ignore constant inputs, they will be ignored by hid-input */
  722 + if (data & HID_MAIN_ITEM_CONSTANT)
  723 + break;
721 724 for (i = 0; i < parser->local.usage_index; i++)
722 725 hid_scan_input_usage(parser, parser->local.usage[i]);
723 726 break;
... ... @@ -1821,8 +1824,6 @@
1821 1824 { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_USB) },
1822 1825 { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K) },
1823 1826 { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) },
1824   - { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_2) },
1825   - { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TOUCH_COVER_2) },
1826 1827 { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_OFFICE_KB) },
1827 1828 { HID_USB_DEVICE(USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E) },
1828 1829 { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN) },
drivers/hid/hid-ids.h
Diff comments   View file @ b81fd5b
... ... @@ -455,7 +455,8 @@
455 455  
456 456 #define USB_VENDOR_ID_INTEL_0 0x8086
457 457 #define USB_VENDOR_ID_INTEL_1 0x8087
458   -#define USB_DEVICE_ID_INTEL_HID_SENSOR 0x09fa
  458 +#define USB_DEVICE_ID_INTEL_HID_SENSOR_0 0x09fa
  459 +#define USB_DEVICE_ID_INTEL_HID_SENSOR_1 0x0a04
459 460  
460 461 #define USB_VENDOR_ID_STM_0 0x0483
461 462 #define USB_DEVICE_ID_STM_HID_SENSOR 0x91d1
... ... @@ -629,8 +630,6 @@
629 630 #define USB_DEVICE_ID_MS_PRESENTER_8K_USB 0x0713
630 631 #define USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K 0x0730
631 632 #define USB_DEVICE_ID_MS_COMFORT_MOUSE_4500 0x076c
632   -#define USB_DEVICE_ID_MS_TOUCH_COVER_2 0x07a7
633   -#define USB_DEVICE_ID_MS_TYPE_COVER_2 0x07a9
634 633  
635 634 #define USB_VENDOR_ID_MOJO 0x8282
636 635 #define USB_DEVICE_ID_RETRO_ADAPTER 0x3201
drivers/hid/hid-microsoft.c
Diff comments   View file @ b81fd5b
... ... @@ -274,10 +274,6 @@
274 274 .driver_data = MS_NOGET },
275 275 { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_MOUSE_4500),
276 276 .driver_data = MS_DUPLICATE_USAGES },
277   - { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_2),
278   - .driver_data = 0 },
279   - { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TOUCH_COVER_2),
280   - .driver_data = 0 },
281 277  
282 278 { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT),
283 279 .driver_data = MS_PRESENTER },
drivers/hid/hid-sensor-hub.c
Diff comments   View file @ b81fd5b
... ... @@ -697,10 +697,13 @@
697 697  
698 698 static const struct hid_device_id sensor_hub_devices[] = {
699 699 { HID_DEVICE(HID_BUS_ANY, HID_GROUP_SENSOR_HUB, USB_VENDOR_ID_INTEL_0,
700   - USB_DEVICE_ID_INTEL_HID_SENSOR),
  700 + USB_DEVICE_ID_INTEL_HID_SENSOR_0),
701 701 .driver_data = HID_SENSOR_HUB_ENUM_QUIRK},
702 702 { HID_DEVICE(HID_BUS_ANY, HID_GROUP_SENSOR_HUB, USB_VENDOR_ID_INTEL_1,
703   - USB_DEVICE_ID_INTEL_HID_SENSOR),
  703 + USB_DEVICE_ID_INTEL_HID_SENSOR_0),
  704 + .driver_data = HID_SENSOR_HUB_ENUM_QUIRK},
  705 + { HID_DEVICE(HID_BUS_ANY, HID_GROUP_SENSOR_HUB, USB_VENDOR_ID_INTEL_1,
  706 + USB_DEVICE_ID_INTEL_HID_SENSOR_1),
704 707 .driver_data = HID_SENSOR_HUB_ENUM_QUIRK},
705 708 { HID_DEVICE(HID_BUS_ANY, HID_GROUP_SENSOR_HUB, USB_VENDOR_ID_STM_0,
706 709 USB_DEVICE_ID_STM_HID_SENSOR),
drivers/hid/hid-sony.c
Diff comments   View file @ b81fd5b
... ... @@ -1721,8 +1721,6 @@
1721 1721 if (sc->quirks & SONY_LED_SUPPORT)
1722 1722 sony_leds_remove(hdev);
1723 1723  
1724   - if (sc->worker_initialized)
1725   - cancel_work_sync(&sc->state_worker);
1726 1724 if (sc->quirks & SONY_BATTERY_SUPPORT) {
1727 1725 hid_hw_close(hdev);
1728 1726 sony_battery_remove(sc);