Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b07974a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 3b98ec4e 9c5c6ed7

drivers/hid/hid-core.c

+1 −0
Original line number Diff line number Diff line
@@ -1659,6 +1659,7 @@ void hid_disconnect(struct hid_device *hdev) 
		hdev->hiddev_disconnect(hdev);

	if (hdev->claimed & HID_CLAIMED_HIDRAW)

		hidraw_disconnect(hdev);

	hdev->claimed = 0;

}

EXPORT_SYMBOL_GPL(hid_disconnect);

drivers/hid/hid-ids.h

+1 −0
Original line number Diff line number Diff line
@@ -299,6 +299,7 @@ 
#define USB_VENDOR_ID_ELAN		0x04f3

#define USB_DEVICE_ID_ELAN_TOUCHSCREEN	0x0089

#define USB_DEVICE_ID_ELAN_TOUCHSCREEN_009B	0x009b

#define USB_DEVICE_ID_ELAN_TOUCHSCREEN_0103	0x0103

#define USB_DEVICE_ID_ELAN_TOUCHSCREEN_016F	0x016f



#define USB_VENDOR_ID_ELECOM		0x056e

drivers/hid/usbhid/hid-quirks.c

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ static const struct hid_blacklist { 
	{ USB_VENDOR_ID_DMI, USB_DEVICE_ID_DMI_ENC, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN, HID_QUIRK_ALWAYS_POLL },

	{ USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN_009B, HID_QUIRK_ALWAYS_POLL },

	{ USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN_0103, HID_QUIRK_ALWAYS_POLL },

	{ USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN_016F, HID_QUIRK_ALWAYS_POLL },

	{ USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2700, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_FORMOSA, USB_DEVICE_ID_FORMOSA_IR_RECEIVER, HID_QUIRK_NO_INIT_REPORTS },