HID: sony: Remove the size check for the Dualshock 4 HID Descriptor (b71b5578) · Commits · 戴 / test

Sony has modified the HID descriptor in new revisions of the Dualshock 4 which causes the size check in the descriptor replacement function to fail. Remove it so that new revisions of the controller will work correctly. The module is completely replacing the descriptor instead of patching it, so the size check isn't really necessary anyways. Signed-off-by:

Frank Praznik <frank.praznik@gmail.com> Signed-off-by:

Jiri Kosina <jkosina@suse.cz>

drivers/hid/hid-sony.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1139,11 +1139,11 @@ static __u8 sony_report_fixup(struct hid_device hdev, __u8 *rdesc,
		* the gyroscope values to corresponding axes so we need a
		* modified one.
		*/
		if ((sc->quirks & DUALSHOCK4_CONTROLLER_USB) && *rsize == 467) {
		if (sc->quirks & DUALSHOCK4_CONTROLLER_USB) {
		hid_info(hdev, "Using modified Dualshock 4 report descriptor with gyroscope axes\n");
		rdesc = dualshock4_usb_rdesc;
		*rsize = sizeof(dualshock4_usb_rdesc);
		} else if ((sc->quirks & DUALSHOCK4_CONTROLLER_BT) && *rsize == 357) {
		} else if (sc->quirks & DUALSHOCK4_CONTROLLER_BT) {
		hid_info(hdev, "Using modified Dualshock 4 Bluetooth report descriptor\n");
		rdesc = dualshock4_bt_rdesc;
		*rsize = sizeof(dualshock4_bt_rdesc);

Admin message