Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52dc085a authored by Michel Hermier's avatar Michel Hermier Committed by Jiri Kosina
Browse files

Revert "HID: microsoft: fix invalid rdesc for 3k kbd" 

This reverts commit 3ccc60f9.

While investigating bug https://bugzilla.kernel.org/show_bug.cgi?id=37982

 ,
there was solid evidences that Microsoft reused the same report
descriptor for the its Digital Media keyboard series.

Since 1989dada "HID: input: ignore System Control application usages if not
System Controls", the keyboard series do not produce a spurious joystick
input device inode without needing to patch the problematic report
descriptor. As such the MS_RDESC_3K reportdescriptor fixup can be removed.

Signed-off-by: default avatarMichel Hermier <michel.hermier@gmail.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 1989dada

drivers/hid/hid-microsoft.c

+1 −9
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
#define MS_RDESC		0x08

#define MS_NOGET		0x10

#define MS_DUPLICATE_USAGES	0x20

#define MS_RDESC_3K		0x40



static __u8 *ms_report_fixup(struct hid_device *hdev, __u8 *rdesc,

		unsigned int *rsize)
@@ -45,13 +44,6 @@ static __u8 *ms_report_fixup(struct hid_device *hdev, __u8 *rdesc, 
		rdesc[557] = 0x35;

		rdesc[559] = 0x45;

	}

	/* the same as above (s/usage/physical/) */

	if ((quirks & MS_RDESC_3K) && *rsize == 106 && rdesc[94] == 0x19 &&

			rdesc[95] == 0x00 && rdesc[96] == 0x29 &&

			rdesc[97] == 0xff) {

		rdesc[94] = 0x35;

		rdesc[96] = 0x45;

	}

	return rdesc;

}
@@ -271,7 +263,7 @@ static const struct hid_device_id ms_devices[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_USB),

		.driver_data = MS_PRESENTER },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K),

		.driver_data = MS_ERGONOMY | MS_RDESC_3K },

		.driver_data = MS_ERGONOMY },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_7K),

		.driver_data = MS_ERGONOMY },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_600),