Commit fe251c4b 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:

 - revert of a commit that switched all Synaptics touchpads over to be
   driven by hid-rmi. It turns out that this caused several user-visible
   regressions, and therefore we revert back to the original state
   before all the reported issues have been fixed.

 - a new uclogic device ID addition, from Xiaolei Yu.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  Revert "HID: rmi: Handle all Synaptics touchpads using hid-rmi"
  HID: uclogic: add support for Ugee Tablet EX07S
parents c08e611b 84379d83

drivers/hid/hid-core.c

+2 −2
Original line number Diff line number Diff line
@@ -819,8 +819,7 @@ 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 ||

		    hid->group == HID_GROUP_MULTITOUCH_WIN_8)

		if (hid->group == HID_GROUP_GENERIC)

			if ((parser->scan_flags & HID_SCAN_FLAG_VENDOR_SPECIFIC)

			    && (parser->scan_flags & HID_SCAN_FLAG_GD_POINTER))

				/*
@@ -2096,6 +2095,7 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UGEE_TABLET_45) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_DRAWIMAGE_G3) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_UGTIZER, USB_DEVICE_ID_UGTIZER_TABLET_GP0610) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE, USB_DEVICE_ID_UGEE_TABLET_EX07S) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_SMARTJOY_PLUS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_SUPER_JOY_BOX_3) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD) },

drivers/hid/hid-ids.h

+3 −0
Original line number Diff line number Diff line
@@ -1028,6 +1028,9 @@ 
#define USB_DEVICE_ID_UGEE_TABLET_45		0x0045

#define USB_DEVICE_ID_YIYNOVA_TABLET		0x004d



#define USB_VENDOR_ID_UGEE		0x28bd

#define USB_DEVICE_ID_UGEE_TABLET_EX07S		0x0071



#define USB_VENDOR_ID_UNITEC	0x227d

#define USB_DEVICE_ID_UNITEC_USB_TOUCH_0709	0x0709

#define USB_DEVICE_ID_UNITEC_USB_TOUCH_0A19	0x0a19

drivers/hid/hid-uclogic.c

+2 −0
Original line number Diff line number Diff line
@@ -977,6 +977,7 @@ static int uclogic_probe(struct hid_device *hdev, 
		}

		break;

	case USB_DEVICE_ID_UGTIZER_TABLET_GP0610:

	case USB_DEVICE_ID_UGEE_TABLET_EX07S:

		/* If this is the pen interface */

		if (intf->cur_altsetting->desc.bInterfaceNumber == 1) {

			rc = uclogic_tablet_enable(hdev);
@@ -1069,6 +1070,7 @@ static const struct hid_device_id uclogic_devices[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UGEE_TABLET_45) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_DRAWIMAGE_G3) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_UGTIZER, USB_DEVICE_ID_UGTIZER_TABLET_GP0610) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE, USB_DEVICE_ID_UGEE_TABLET_EX07S) },

	{ }

};

MODULE_DEVICE_TABLE(hid, uclogic_devices);

CRA Git | Maintained and supported by SUSTech CRA and CCSE