Merge branch 'master' into csb1725

[mv-sheeva.git] / drivers / hid / hid-elecom.c

diff --git a/drivers/hid/hid-elecom.c b/drivers/hid/hid-elecom.c
index 7a40878f46b4920d23619d4ee1fc3ea7c691c235..6e31f305397d1b60bb750efd1f81f17724e175a8 100644 (file)
--- a/drivers/hid/hid-elecom.c
+++ b/drivers/hid/hid-elecom.c
@@ -20,14 +20,15 @@
 
 #include "hid-ids.h"
 
-static void elecom_report_fixup(struct hid_device *hdev, __u8 *rdesc,
-               unsigned int rsize)
+static __u8 *elecom_report_fixup(struct hid_device *hdev, __u8 *rdesc,
+               unsigned int *rsize)
 {
-       if (rsize >= 48 && rdesc[46] == 0x05 && rdesc[47] == 0x0c) {
+       if (*rsize >= 48 && rdesc[46] == 0x05 && rdesc[47] == 0x0c) {
                dev_info(&hdev->dev, "Fixing up Elecom BM084 "
                                "report descriptor.\n");
                rdesc[47] = 0x00;
        }
+    return rdesc;
 }
 
 static const struct hid_device_id elecom_devices[] = {