Merge branch 'uc-logic' into for-linus
[~shefty/rdma-dev.git] / drivers / hid / hid-sony.c
index 0c164b3dce3a33a060795cfc4d9d0fe2ac6eb1cf..677bb3da10e8d4149d5d6583f943f6a767c9d3c1 100644 (file)
@@ -33,17 +33,18 @@ struct sony_sc {
 };
 
 /* Sony Vaio VGX has wrongly mouse pointer declared as constant */
-static void sony_report_fixup(struct hid_device *hdev, __u8 *rdesc,
-               unsigned int rsize)
+static __u8 *sony_report_fixup(struct hid_device *hdev, __u8 *rdesc,
+               unsigned int *rsize)
 {
        struct sony_sc *sc = hid_get_drvdata(hdev);
 
        if ((sc->quirks & VAIO_RDESC_CONSTANT) &&
-                       rsize >= 56 && rdesc[54] == 0x81 && rdesc[55] == 0x07) {
+                       *rsize >= 56 && rdesc[54] == 0x81 && rdesc[55] == 0x07) {
                dev_info(&hdev->dev, "Fixing up Sony Vaio VGX report "
                                "descriptor\n");
                rdesc[55] = 0x06;
        }
+       return rdesc;
 }
 
 static int sixaxis_usb_output_raw_report(struct hid_device *hid, __u8 *buf,