Commit 2bacedad authored by Giedrius Statkevičius's avatar Giedrius Statkevičius Committed by Jiri Kosina
Browse files

HID: Add a new id 0x501a for Genius MousePen i608X 

New Genius MousePen i608X devices have a new id 0x501a instead of the
old 0x5011 so add a new #define with "_2" appended and change required
places.

The remaining two checkpatch warnings about line length
being over 80 characters are present in the original files too and this
patch was made in the same style (no line break).

Just adding a new id and changing the required places should make the
new device work without any issues according to the bug report in the
following url.

This patch was made according to and fixes:
https://bugzilla.kernel.org/show_bug.cgi?id=67111



Signed-off-by: default avatarGiedrius Statkevičius <giedrius.statkevicius@gmail.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent a0e625f8

drivers/hid/hid-core.c

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

drivers/hid/hid-ids.h

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

drivers/hid/hid-kye.c

+4 −0
Original line number Diff line number Diff line
@@ -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) {
@@ -445,6 +447,8 @@ static const struct hid_device_id kye_devices[] = { 
				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_KYE,

drivers/hid/usbhid/hid-quirks.c

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE