Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 6b07974af9698225766d42175470b1a5d7bf9f48

Authored by Linus Torvalds
2 parents 3b98ec4eec 9c5c6ed7b5
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, 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

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

Pull HID fixes from Jiri Kosina:

 - fix for an oops in HID core upon repeated subdriver insertion/removal
   under certain circumstances, by Benjamin Tissoires

 - quirk for another Elan Touchscreen device, by Adel Gadllah

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: core: cleanup .claimed field on disconnect
  HID: usbhid: enable always-poll quirk for Elan Touchscreen 0103

Showing 3 changed files Side-by-side Diff

drivers/hid/hid-core.c
Diff comments   View file @ 6b07974
... ... @@ -1659,6 +1659,7 @@
1659 1659 hdev->hiddev_disconnect(hdev);
1660 1660 if (hdev->claimed & HID_CLAIMED_HIDRAW)
1661 1661 hidraw_disconnect(hdev);
  1662 + hdev->claimed = 0;
1662 1663 }
1663 1664 EXPORT_SYMBOL_GPL(hid_disconnect);
1664 1665  
drivers/hid/hid-ids.h
Diff comments   View file @ 6b07974
... ... @@ -299,6 +299,7 @@
299 299 #define USB_VENDOR_ID_ELAN 0x04f3
300 300 #define USB_DEVICE_ID_ELAN_TOUCHSCREEN 0x0089
301 301 #define USB_DEVICE_ID_ELAN_TOUCHSCREEN_009B 0x009b
  302 +#define USB_DEVICE_ID_ELAN_TOUCHSCREEN_0103 0x0103
302 303 #define USB_DEVICE_ID_ELAN_TOUCHSCREEN_016F 0x016f
303 304  
304 305 #define USB_VENDOR_ID_ELECOM 0x056e
drivers/hid/usbhid/hid-quirks.c
Diff comments   View file @ 6b07974
... ... @@ -72,6 +72,7 @@
72 72 { USB_VENDOR_ID_DMI, USB_DEVICE_ID_DMI_ENC, HID_QUIRK_NOGET },
73 73 { USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN, HID_QUIRK_ALWAYS_POLL },
74 74 { USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN_009B, HID_QUIRK_ALWAYS_POLL },
  75 + { USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN_0103, HID_QUIRK_ALWAYS_POLL },
75 76 { USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN_016F, HID_QUIRK_ALWAYS_POLL },
76 77 { USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2700, HID_QUIRK_NOGET },
77 78 { USB_VENDOR_ID_FORMOSA, USB_DEVICE_ID_FORMOSA_IR_RECEIVER, HID_QUIRK_NO_INIT_REPORTS },