On Tue, 17 Aug 2010, Alan Ott wrote:
> When I made commit 29129a98e6fc89, I didn't account for *buf not being
> the report ID anymore, as buf is incremented.
>
> This applies to 2.6.35 and newer.
>
> Signed-off-by: Alan Ott <alan@xxxxxxxxxxx>
> ---
> drivers/hid/usbhid/hid-core.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
> index b729c02..ffd6899 100644
> --- a/drivers/hid/usbhid/hid-core.c
> +++ b/drivers/hid/usbhid/hid-core.c
> @@ -828,6 +828,7 @@ static int usbhid_output_raw_report(struct hid_device *hid, __u8 *buf, size_t co
> }
> } else {
> int skipped_report_id = 0;
> + int report_id = buf[0];
> if (buf[0] == 0x0) {
> /* Don't send the Report ID */
> buf++;
> @@ -837,7 +838,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,
> - ((report_type + 1) << 8) | *buf,
> + ((report_type + 1) << 8) | report_id,
> interface->desc.bInterfaceNumber, buf, count,
> USB_CTRL_SET_TIMEOUT);
> /* count also the report id, if this was a numbered report. */
Good catch, applied, thank you.
--
Jiri Kosina
SUSE Labs, Novell Inc.
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
