diff options
| author | Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2014-03-09 04:52:42 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2014-03-14 15:30:20 +0100 |
| commit | e534a9352237e84263cecedff283387b144b3ed8 (patch) | |
| tree | 59ef11db183e22e6192c7a5ab9587a62c0ad7dd1 /drivers/hid/usbhid | |
| parent | Merge branch 'for-3.15/sony' into for-3.15/hid-core-ll-transport-cleanup (diff) | |
| download | linux-e534a9352237e84263cecedff283387b144b3ed8.tar.xz linux-e534a9352237e84263cecedff283387b144b3ed8.zip | |
HID: sony: do not rely on hid_output_raw_report
hid_out_raw_report is going to be obsoleted as it is not part of the
unified HID low level transport documentation
(Documentation/hid/hid-transport.txt)
To do so, we need to introduce two new quirks:
* HID_QUIRK_NO_OUTPUT_REPORTS_ON_INTR_EP: this quirks prevents the
transport driver to use the interrupt channel to send output report
(and thus force to use HID_REQ_SET_REPORT command)
* HID_QUIRK_SKIP_OUTPUT_REPORT_ID: this one forces usbhid to not
include the report ID in the buffer it sends to the device through
HID_REQ_SET_REPORT in case of an output report
This also fixes a regression introduced in commit 3a75b24949a8
(HID: hidraw: replace hid_output_raw_report() calls by appropriates ones).
The hidraw API was not able to communicate with the PS3 SixAxis
controllers in USB mode.
Reviewed-by: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Tested-by: Antonio Ospite <ao2@ao2.it>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/usbhid')
| -rw-r--r-- | drivers/hid/usbhid/hid-core.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c index 0d1d87533f48..3bc7cad48fe0 100644 --- a/drivers/hid/usbhid/hid-core.c +++ b/drivers/hid/usbhid/hid-core.c @@ -894,7 +894,12 @@ static int usbhid_set_raw_report(struct hid_device *hid, unsigned int reportnum, int ret, skipped_report_id = 0; /* Byte 0 is the report number. Report data starts at byte 1.*/ - buf[0] = reportnum; + if ((rtype == HID_OUTPUT_REPORT) && + (hid->quirks & HID_QUIRK_SKIP_OUTPUT_REPORT_ID)) + buf[0] = 0; + else + buf[0] = reportnum; + if (buf[0] == 0x0) { /* Don't send the Report ID */ buf++; |