1 files changed, 28 insertions, 0 deletions

diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
index 7f33ebf299c2..16df4d84f525 100644
--- a/drivers/hid/hid-sony.c
+++ b/drivers/hid/hid-sony.c
@@ -33,6 +33,28 @@ static const u8 sixaxis_rdesc_fixup[] = {
         0x03, 0x46, 0xFF, 0x03, 0x09, 0x01, 0x81, 0x02
 };
 
+static const u8 sixaxis_rdesc_fixup2[] = {
+        0x05, 0x01, 0x09, 0x04, 0xa1, 0x01, 0xa1, 0x02,
+        0x85, 0x01, 0x75, 0x08, 0x95, 0x01, 0x15, 0x00,
+        0x26, 0xff, 0x00, 0x81, 0x03, 0x75, 0x01, 0x95,
+        0x13, 0x15, 0x00, 0x25, 0x01, 0x35, 0x00, 0x45,
+        0x01, 0x05, 0x09, 0x19, 0x01, 0x29, 0x13, 0x81,
+        0x02, 0x75, 0x01, 0x95, 0x0d, 0x06, 0x00, 0xff,
+        0x81, 0x03, 0x15, 0x00, 0x26, 0xff, 0x00, 0x05,
+        0x01, 0x09, 0x01, 0xa1, 0x00, 0x75, 0x08, 0x95,
+        0x04, 0x35, 0x00, 0x46, 0xff, 0x00, 0x09, 0x30,
+        0x09, 0x31, 0x09, 0x32, 0x09, 0x35, 0x81, 0x02,
+        0xc0, 0x05, 0x01, 0x95, 0x13, 0x09, 0x01, 0x81,
+        0x02, 0x95, 0x0c, 0x81, 0x01, 0x75, 0x10, 0x95,
+        0x04, 0x26, 0xff, 0x03, 0x46, 0xff, 0x03, 0x09,
+        0x01, 0x81, 0x02, 0xc0, 0xa1, 0x02, 0x85, 0x02,
+        0x75, 0x08, 0x95, 0x30, 0x09, 0x01, 0xb1, 0x02,
+        0xc0, 0xa1, 0x02, 0x85, 0xee, 0x75, 0x08, 0x95,
+        0x30, 0x09, 0x01, 0xb1, 0x02, 0xc0, 0xa1, 0x02,
+        0x85, 0xef, 0x75, 0x08, 0x95, 0x30, 0x09, 0x01,
+        0xb1, 0x02, 0xc0, 0xc0,
+};
+
 struct sony_sc {
         unsigned long quirks;
 };
@@ -56,6 +78,12 @@ static __u8 *sony_report_fixup(struct hid_device *hdev, __u8 *rdesc,
                 hid_info(hdev, "Fixing up Sony Sixaxis report descriptor\n");
                 memcpy((void *)&rdesc[83], (void *)&sixaxis_rdesc_fixup,
                         sizeof(sixaxis_rdesc_fixup));
+        } else if (sc->quirks & SIXAXIS_CONTROLLER_USB &&
+                   *rsize > sizeof(sixaxis_rdesc_fixup2)) {
+                hid_info(hdev, "Sony Sixaxis clone detected. Using original report descriptor (size: %d clone; %d new)\n",
+                         *rsize, (int)sizeof(sixaxis_rdesc_fixup2));
+                *rsize = sizeof(sixaxis_rdesc_fixup2);
+                memcpy(rdesc, &sixaxis_rdesc_fixup2, *rsize);
         }
         return rdesc;
 }