Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752387Ab0HQEod (ORCPT ); Tue, 17 Aug 2010 00:44:33 -0400 Received: from core.signal11.us ([64.251.29.136]:56304 "EHLO core.signal11.us" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751940Ab0HQEob (ORCPT ); Tue, 17 Aug 2010 00:44:31 -0400 From: Alan Ott To: Jiri Kosina , Alan Stern , Greg Kroah-Hartman , Alan Ott , Marcel Holtmann , linux-usb@vger.kernel.org, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Alan Ott Subject: [PATCH 1/1] usbhid: Set Report ID properly for Output reports on the Control endpoint. Date: Tue, 17 Aug 2010 00:44:04 -0400 Message-Id: <1282020244-25786-1-git-send-email-alan@signal11.us> X-Mailer: git-send-email 1.7.0.4 X-DSPAM-Result: Whitelisted X-DSPAM-Processed: Tue Aug 17 00:44:31 2010 X-DSPAM-Confidence: 0.9899 X-DSPAM-Probability: 0.0000 X-DSPAM-Signature: 4c6a13af22841183026203 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1431 Lines: 40 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 --- 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. */ -- 1.7.0.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/