Commit bf226cd3 authored by Nikolai Kondrashov's avatar Nikolai Kondrashov Committed by Benjamin Tissoires
Browse files

HID: Clarify vendor ID reuse by Ugee tablets 



Add "_UCLOGIC" to Ugee tablet device ID macros so it's clear they come
with UC-Logic vendor ID.

Signed-off-by: default avatarNikolai Kondrashov <spbnick@gmail.com>
Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
parent 7c2af0a1

drivers/hid/hid-ids.h

+2 −2
Original line number Diff line number Diff line
@@ -1135,8 +1135,8 @@ 
#define USB_DEVICE_ID_UCLOGIC_WIRELESS_TABLET_TWHL850	0x0522

#define USB_DEVICE_ID_UCLOGIC_TABLET_TWHA60	0x0781

#define USB_DEVICE_ID_UCLOGIC_DRAWIMAGE_G3	0x3031

#define USB_DEVICE_ID_UGEE_TABLET_81		0x0081

#define USB_DEVICE_ID_UGEE_TABLET_45		0x0045

#define USB_DEVICE_ID_UCLOGIC_UGEE_TABLET_81	0x0081

#define USB_DEVICE_ID_UCLOGIC_UGEE_TABLET_45	0x0045

#define USB_DEVICE_ID_YIYNOVA_TABLET		0x004d



#define USB_VENDOR_ID_UGEE		0x28bd

drivers/hid/hid-quirks.c

+2 −2
Original line number Diff line number Diff line
@@ -685,8 +685,8 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_WIRELESS_TABLET_TWHL850) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_TWHA60) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_YIYNOVA_TABLET) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UGEE_TABLET_81) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UGEE_TABLET_45) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_UGEE_TABLET_81) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_UGEE_TABLET_45) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_DRAWIMAGE_G3) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE, USB_DEVICE_ID_UGEE_TABLET_EX07S) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_UGTIZER, USB_DEVICE_ID_UGTIZER_TABLET_GP0610) },

drivers/hid/hid-uclogic.c

+4 −4
Original line number Diff line number Diff line
@@ -957,9 +957,9 @@ static int uclogic_probe(struct hid_device *hdev, 
	switch (id->product) {

	case USB_DEVICE_ID_HUION_TABLET:

	case USB_DEVICE_ID_YIYNOVA_TABLET:

	case USB_DEVICE_ID_UGEE_TABLET_81:

	case USB_DEVICE_ID_UCLOGIC_UGEE_TABLET_81:

	case USB_DEVICE_ID_UCLOGIC_DRAWIMAGE_G3:

	case USB_DEVICE_ID_UGEE_TABLET_45:

	case USB_DEVICE_ID_UCLOGIC_UGEE_TABLET_45:

		/* If this is the pen interface */

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

			rc = uclogic_tablet_enable(hdev);
@@ -1065,8 +1065,8 @@ static const struct hid_device_id uclogic_devices[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_HUION, USB_DEVICE_ID_HUION_TABLET) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_HUION_TABLET) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_YIYNOVA_TABLET) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UGEE_TABLET_81) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UGEE_TABLET_45) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_UGEE_TABLET_81) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_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) },