Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs...

[~andy/linux] / include / linux / hid.h

diff --git a/include/linux/hid.h b/include/linux/hid.h
index 4cfe02c3fa4e2c40932493cf73501ce0d5c5f440..bb0f56f5c01ef81c51808e7cd97fe9543567ae1e 100644 (file)
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -627,8 +627,8 @@ struct hid_driver {
        int (*event)(struct hid_device *hdev, struct hid_field *field,
                        struct hid_usage *usage, __s32 value);
 
-       void (*report_fixup)(struct hid_device *hdev, __u8 *buf,
-                       unsigned int size);
+       __u8 *(*report_fixup)(struct hid_device *hdev, __u8 *buf,
+                       unsigned int *size);
 
        int (*input_mapping)(struct hid_device *hdev,
                        struct hid_input *hidinput, struct hid_field *field,