Merge branch 'master' into upstream

[pandora-kernel.git] / drivers / hid / hid-kye.c

diff --git a/drivers/hid/hid-kye.c b/drivers/hid/hid-kye.c
index f887171..f2ba9ef 100644 (file)
--- a/drivers/hid/hid-kye.c
+++ b/drivers/hid/hid-kye.c
@@ -23,23 +23,24 @@
  *   - report size 8 count 1 must be size 1 count 8 for button bitfield
  *   - change the button usage range to 4-7 for the extra buttons
  */
-static void kye_report_fixup(struct hid_device *hdev, __u8 *rdesc,
-               unsigned int rsize)
+static __u8 *kye_report_fixup(struct hid_device *hdev, __u8 *rdesc,
+               unsigned int *rsize)
 {
-       if (rsize >= 74 &&
+       if (*rsize >= 74 &&
                rdesc[61] == 0x05 && rdesc[62] == 0x08 &&
                rdesc[63] == 0x19 && rdesc[64] == 0x08 &&
                rdesc[65] == 0x29 && rdesc[66] == 0x0f &&
                rdesc[71] == 0x75 && rdesc[72] == 0x08 &&
                rdesc[73] == 0x95 && rdesc[74] == 0x01) {
-               dev_info(&hdev->dev, "fixing up Kye/Genius Ergo Mouse report "
-                               "descriptor\n");
+               hid_info(hdev,
+                        "fixing up Kye/Genius Ergo Mouse report descriptor\n");
                rdesc[62] = 0x09;
                rdesc[64] = 0x04;
                rdesc[66] = 0x07;
                rdesc[72] = 0x01;
                rdesc[74] = 0x08;
        }
+       return rdesc;
 }
 
 static const struct hid_device_id kye_devices[] = {