diff options
| -rw-r--r-- | drivers/hid/hid-core.c | 1 | ||||
| -rw-r--r-- | drivers/hid/hid-ids.h | 1 | ||||
| -rw-r--r-- | drivers/hid/hid-kye.c | 4 | ||||
| -rw-r--r-- | drivers/hid/usbhid/hid-quirks.c | 1 | 
4 files changed, 7 insertions, 0 deletions
| diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index c3d0ac1a0988..8b638792cb43 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -1805,6 +1805,7 @@ static const struct hid_device_id hid_have_special_driver[] = {  	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_ERGO_525V) },  	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_I405X) },  	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_MOUSEPEN_I608X) }, +	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_MOUSEPEN_I608X_2) },  	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_M610X) },  	{ HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD) },  	{ HID_USB_DEVICE(USB_VENDOR_ID_LCPOWER, USB_DEVICE_ID_LCPOWER_LC1000 ) }, diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 7460f3402298..9243359c1821 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -526,6 +526,7 @@  #define USB_DEVICE_ID_KYE_GPEN_560	0x5003  #define USB_DEVICE_ID_KYE_EASYPEN_I405X	0x5010  #define USB_DEVICE_ID_KYE_MOUSEPEN_I608X	0x5011 +#define USB_DEVICE_ID_KYE_MOUSEPEN_I608X_2	0x501a  #define USB_DEVICE_ID_KYE_EASYPEN_M610X	0x5013  #define USB_VENDOR_ID_LABTEC		0x1020 diff --git a/drivers/hid/hid-kye.c b/drivers/hid/hid-kye.c index b92bf01a1ae8..158fcf577fae 100644 --- a/drivers/hid/hid-kye.c +++ b/drivers/hid/hid-kye.c @@ -323,6 +323,7 @@ static __u8 *kye_report_fixup(struct hid_device *hdev, __u8 *rdesc,  		}  		break;  	case USB_DEVICE_ID_KYE_MOUSEPEN_I608X: +	case USB_DEVICE_ID_KYE_MOUSEPEN_I608X_2:  		if (*rsize == MOUSEPEN_I608X_RDESC_ORIG_SIZE) {  			rdesc = mousepen_i608x_rdesc_fixed;  			*rsize = sizeof(mousepen_i608x_rdesc_fixed); @@ -415,6 +416,7 @@ static int kye_probe(struct hid_device *hdev, const struct hid_device_id *id)  	switch (id->product) {  	case USB_DEVICE_ID_KYE_EASYPEN_I405X:  	case USB_DEVICE_ID_KYE_MOUSEPEN_I608X: +	case USB_DEVICE_ID_KYE_MOUSEPEN_I608X_2:  	case USB_DEVICE_ID_KYE_EASYPEN_M610X:  		ret = kye_tablet_enable(hdev);  		if (ret) { @@ -446,6 +448,8 @@ static const struct hid_device_id kye_devices[] = {  	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE,  				USB_DEVICE_ID_KYE_MOUSEPEN_I608X) },  	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, +				USB_DEVICE_ID_KYE_MOUSEPEN_I608X_2) }, +	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE,  				USB_DEVICE_ID_KYE_EASYPEN_M610X) },  	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE,  				USB_DEVICE_ID_GENIUS_GILA_GAMING_MOUSE) }, diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c index dc89be90b35e..b27b3d33ebab 100644 --- a/drivers/hid/usbhid/hid-quirks.c +++ b/drivers/hid/usbhid/hid-quirks.c @@ -124,6 +124,7 @@ static const struct hid_blacklist {  	{ USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_WIRELESS, HID_QUIRK_MULTI_INPUT },  	{ USB_VENDOR_ID_SIGMA_MICRO, USB_DEVICE_ID_SIGMA_MICRO_KEYBOARD, HID_QUIRK_NO_INIT_REPORTS },  	{ USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_MOUSEPEN_I608X, HID_QUIRK_MULTI_INPUT }, +	{ USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_MOUSEPEN_I608X_2, HID_QUIRK_MULTI_INPUT },  	{ USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_M610X, HID_QUIRK_MULTI_INPUT },  	{ USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_DUOSENSE, HID_QUIRK_NO_INIT_REPORTS },  	{ USB_VENDOR_ID_SEMICO, USB_DEVICE_ID_SEMICO_USB_KEYKOARD, HID_QUIRK_NO_INIT_REPORTS }, |