Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c29771c2 authored by Alan Ott's avatar Alan Ott Committed by Jiri Kosina
Browse files

HID: Set Report ID properly for Output reports on the Control endpoint. 



When I made commit 29129a98 ("HID: Send Report ID when numbered
reports are sent over the control endpoint"), I didn't account for *buf
not being the report ID anymore, as buf is incremented.

Signed-off-by: default avatarAlan Ott <alan@signal11.us>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 426409b1

drivers/hid/usbhid/hid-core.c

+2 −1
Original line number Diff line number Diff line
@@ -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. */