From patchwork Tue Aug 17 04:44:04 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Ott X-Patchwork-Id: 119855 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o7H4iqNs006960 for ; Tue, 17 Aug 2010 04:45:24 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752062Ab0HQEoc (ORCPT ); Tue, 17 Aug 2010 00:44:32 -0400 Received: from core.signal11.us ([64.251.29.136]:56302 "EHLO core.signal11.us" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751806Ab0HQEob (ORCPT ); Tue, 17 Aug 2010 00:44:31 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by core.signal11.us (Postfix) with SMTP id E006E1CCAA46 for ; Tue, 17 Aug 2010 00:44:30 -0400 (EDT) Received: from localhost.localdomain (c-76-26-177-242.hsd1.fl.comcast.net [76.26.177.242]) by core.signal11.us (Postfix) with ESMTP id 2CAB51CCAA40; Tue, 17 Aug 2010 00:44:29 -0400 (EDT) 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:30 2010 X-DSPAM-Confidence: 0.9899 X-DSPAM-Probability: 0.0000 X-DSPAM-Signature: 4c6a13ae22841630327241 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 17 Aug 2010 04:45:24 +0000 (UTC) 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. */