summaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-sony.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2010-10-23 22:49:32 +0200
committerJiri Kosina <jkosina@suse.cz>2010-10-23 22:49:32 +0200
commit8b66a16f25f819bb1f132f075c5c01a288776cf8 (patch)
treeff6e16818194aca66d8ea34f9765067b2a82020a /drivers/hid/hid-sony.c
parentbbd128b5acae85b2ef346e95cc5a729ac5252f19 (diff)
parent41fa92302be7fa37c5c38e17e2097d3e5e9da13a (diff)
downloadlinux-8b66a16f25f819bb1f132f075c5c01a288776cf8.tar.gz
linux-8b66a16f25f819bb1f132f075c5c01a288776cf8.tar.bz2
linux-8b66a16f25f819bb1f132f075c5c01a288776cf8.zip
Merge branch 'uc-logic' into for-linus
Conflicts: drivers/hid/hid-ids.h drivers/hid/hid-lg.c drivers/hid/usbhid/hid-quirks.c
Diffstat (limited to 'drivers/hid/hid-sony.c')
-rw-r--r--drivers/hid/hid-sony.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
index 0c164b3dce3a..677bb3da10e8 100644
--- a/drivers/hid/hid-sony.c
+++ b/drivers/hid/hid-sony.c
@@ -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,