Skip to content

Commit 8676675

Browse files
author
Jiri Kosina
committed
Merge branch 'for-5.3/uclogic' into for-linus
2 parents 74acee3 + 88bb346 commit 8676675

File tree

3 files changed

+5
-0
lines changed

3 files changed

+5
-0
lines changed

drivers/hid/hid-ids.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1157,6 +1157,7 @@
11571157
#define USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO01 0x0042
11581158
#define USB_DEVICE_ID_UGEE_TABLET_G5 0x0074
11591159
#define USB_DEVICE_ID_UGEE_TABLET_EX07S 0x0071
1160+
#define USB_DEVICE_ID_UGEE_TABLET_RAINBOW_CV720 0x0055
11601161

11611162
#define USB_VENDOR_ID_UNITEC 0x227d
11621163
#define USB_DEVICE_ID_UNITEC_USB_TOUCH_0709 0x0709

drivers/hid/hid-uclogic-core.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -389,6 +389,8 @@ static const struct hid_device_id uclogic_devices[] = {
389389
USB_DEVICE_ID_UGEE_TABLET_G5) },
390390
{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE,
391391
USB_DEVICE_ID_UGEE_TABLET_EX07S) },
392+
{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE,
393+
USB_DEVICE_ID_UGEE_TABLET_RAINBOW_CV720) },
392394
{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE,
393395
USB_DEVICE_ID_UGEE_XPPEN_TABLET_G540) },
394396
{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE,

drivers/hid/hid-uclogic-params.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1001,6 +1001,8 @@ int uclogic_params_init(struct uclogic_params *params,
10011001
USB_DEVICE_ID_UGEE_XPPEN_TABLET_G540):
10021002
case VID_PID(USB_VENDOR_ID_UGEE,
10031003
USB_DEVICE_ID_UGEE_XPPEN_TABLET_G640):
1004+
case VID_PID(USB_VENDOR_ID_UGEE,
1005+
USB_DEVICE_ID_UGEE_TABLET_RAINBOW_CV720):
10041006
/* If this is the pen interface */
10051007
if (bInterfaceNumber == 1) {
10061008
/* Probe v1 pen parameters */

0 commit comments

Comments
 (0)