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

Commit 86766756 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'for-5.3/uclogic' into for-linus

parents 74acee30 88bb346d

drivers/hid/hid-ids.h

+1 −0
Original line number Diff line number Diff line
@@ -1157,6 +1157,7 @@ 
#define USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO01	0x0042

#define USB_DEVICE_ID_UGEE_TABLET_G5		0x0074

#define USB_DEVICE_ID_UGEE_TABLET_EX07S		0x0071

#define USB_DEVICE_ID_UGEE_TABLET_RAINBOW_CV720	0x0055



#define USB_VENDOR_ID_UNITEC	0x227d

#define USB_DEVICE_ID_UNITEC_USB_TOUCH_0709	0x0709

drivers/hid/hid-uclogic-core.c

+2 −0
Original line number Diff line number Diff line
@@ -389,6 +389,8 @@ static const struct hid_device_id uclogic_devices[] = { 
				USB_DEVICE_ID_UGEE_TABLET_G5) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE,

				USB_DEVICE_ID_UGEE_TABLET_EX07S) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE,

				USB_DEVICE_ID_UGEE_TABLET_RAINBOW_CV720) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE,

				USB_DEVICE_ID_UGEE_XPPEN_TABLET_G540) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE,

drivers/hid/hid-uclogic-params.c

+2 −0
Original line number Diff line number Diff line
@@ -1001,6 +1001,8 @@ int uclogic_params_init(struct uclogic_params *params, 
		     USB_DEVICE_ID_UGEE_XPPEN_TABLET_G540):

	case VID_PID(USB_VENDOR_ID_UGEE,

		     USB_DEVICE_ID_UGEE_XPPEN_TABLET_G640):

	case VID_PID(USB_VENDOR_ID_UGEE,

		     USB_DEVICE_ID_UGEE_TABLET_RAINBOW_CV720):

		/* If this is the pen interface */

		if (bInterfaceNumber == 1) {

			/* Probe v1 pen parameters */