diff options
author | Jiri Kosina <jkosina@suse.cz> | 2010-02-25 17:39:16 +0100 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2010-02-25 17:39:16 +0100 |
commit | 14ef2b0c026558d37662e5e095d59c64597d5769 (patch) | |
tree | 230c09cc65bc94384c687fed87e6ada954f80609 /drivers/hid/usbhid | |
parent | HID: usbhid: initialize interface pointers early enough (diff) | |
parent | HID: magicmouse: coding style and probe failure fixes (diff) | |
download | linux-14ef2b0c026558d37662e5e095d59c64597d5769.tar.xz linux-14ef2b0c026558d37662e5e095d59c64597d5769.zip |
Merge branches 'upstream', 'raw_report_modifications' and 'apple_magic_mouse' into for-linus
Conflicts:
drivers/hid/Kconfig
Diffstat (limited to 'drivers/hid/usbhid')
-rw-r--r-- | drivers/hid/usbhid/hid-core.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c index ceaf4a14b67b..56d06cd8075b 100644 --- a/drivers/hid/usbhid/hid-core.c +++ b/drivers/hid/usbhid/hid-core.c @@ -798,7 +798,8 @@ static int hid_alloc_buffers(struct usb_device *dev, struct hid_device *hid) return 0; } -static int usbhid_output_raw_report(struct hid_device *hid, __u8 *buf, size_t count) +static int usbhid_output_raw_report(struct hid_device *hid, __u8 *buf, size_t count, + unsigned char report_type) { struct usbhid_device *usbhid = hid->driver_data; struct usb_device *dev = hid_to_usb_dev(hid); @@ -809,7 +810,7 @@ static int usbhid_output_raw_report(struct hid_device *hid, __u8 *buf, size_t co ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0), HID_REQ_SET_REPORT, USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE, - ((HID_OUTPUT_REPORT + 1) << 8) | *buf, + ((report_type + 1) << 8) | *buf, interface->desc.bInterfaceNumber, buf + 1, count - 1, USB_CTRL_SET_TIMEOUT); |