Skip to contentSkip to conversation

hid: sony: Remove the size check for the Dualshock 4 HID Descriptor

PATCH Applied Frank Praznik 2 participants 2 messages Nov 6, 2015 – Nov 19, 2015 HID

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hid: sony: Remove the size check for the Dualshock 4 HID Descriptor

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.

---

This fixes the following bug:
https://bugzilla.kernel.org/show_bug.cgi?id=107081

 drivers/hid/hid-sony.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/hid/hid-sony.c +2 -2
index 661f94f..e38d287 100644
@@ -1137,11 +1137,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);
Signature · 1 line
2.4.3
maintainer Applied
#1 lore raw
Quoted 8 lines · Frank Praznik

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.

Applied to for-4.5/sony, thanks.

Signature · 2 lines
Jiri Kosina
SUSE Labs