Merge branch 'for-5.3/uclogic' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Tue, 9 Jul 2019 23:40:23 +0000 (01:40 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 9 Jul 2019 23:40:23 +0000 (01:40 +0200)
drivers/hid/hid-ids.h
drivers/hid/hid-uclogic-core.c
drivers/hid/hid-uclogic-params.c

index bfc584ada4ebf1a45ab58a1a27024ec367d317f9..0d695f8e1b2c4cb5771e6fdf28d75af076d886fa 100644 (file)
 #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
index 914fb527ae7a78e57fdad2dee7e6d50641c2f6cf..86b568037cb8af6ed004c4067f4d4314d3ed04b1 100644 (file)
@@ -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,
index 273d784fff66df68bb7ab8166599ca343e939813..78a364ae2f68580913c2e0e589cc9156ca4b8140 100644 (file)
@@ -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 */