Commit 102750b8 authored by Nikolai Kondrashov's avatar Nikolai Kondrashov Committed by Jiri Kosina
Browse files

HID: kye: Rename MousePen i608X v2 macro 



Rename the device ID macro for the second version of KYE MousePen i608x
graphics tablet to have "V" in its name to signify that "2" is a
version.

I.e. USB_DEVICE_ID_KYE_MOUSEPEN_I608X_2 ->
     USB_DEVICE_ID_KYE_MOUSEPEN_I608X_V2

This also makes applying additional fixes from DIGImend easier.

Signed-off-by: default avatarNikolai Kondrashov <spbnick@gmail.com>
Reviewed-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent ce7ef551

drivers/hid/hid-core.c

+1 −1
Original line number Diff line number Diff line
@@ -1916,7 +1916,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_MOUSEPEN_I608X_V2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_M610X) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_PENSKETCH_M912) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD) },

drivers/hid/hid-ids.h

+1 −1
Original line number Diff line number Diff line
@@ -565,7 +565,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_MOUSEPEN_I608X_V2	0x501a

#define USB_DEVICE_ID_KYE_EASYPEN_M610X	0x5013

#define USB_DEVICE_ID_KYE_PENSKETCH_M912	0x5015

drivers/hid/hid-kye.c

+3 −3
Original line number Diff line number Diff line
@@ -439,7 +439,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:

	case USB_DEVICE_ID_KYE_MOUSEPEN_I608X_V2:

		if (*rsize == MOUSEPEN_I608X_RDESC_ORIG_SIZE) {

			rdesc = mousepen_i608x_rdesc_fixed;

			*rsize = sizeof(mousepen_i608x_rdesc_fixed);
@@ -538,7 +538,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_MOUSEPEN_I608X_V2:

	case USB_DEVICE_ID_KYE_EASYPEN_M610X:

	case USB_DEVICE_ID_KYE_PENSKETCH_M912:

		ret = kye_tablet_enable(hdev);
@@ -571,7 +571,7 @@ 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) },

				USB_DEVICE_ID_KYE_MOUSEPEN_I608X_V2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE,

				USB_DEVICE_ID_KYE_EASYPEN_M610X) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE,

drivers/hid/usbhid/hid-quirks.c

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,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_MOUSEPEN_I608X_V2, HID_QUIRK_MULTI_INPUT },

	{ USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_M610X, HID_QUIRK_MULTI_INPUT },

	{ USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_PENSKETCH_M912, HID_QUIRK_MULTI_INPUT },

	{ USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_DUOSENSE, HID_QUIRK_NO_INIT_REPORTS },