diff options
| author | Alan Ott <alan@signal11.us> | 2010-04-26 18:34:46 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-04-27 10:22:53 +0200 |
| commit | 5a38f2c7c4dd53d5be097930902c108e362584a3 (patch) | |
| tree | d20f7b3b4ec95df073c670bfa5f592ad86a73183 /drivers/hid | |
| parent | c85b86a6dc7b5b4607c3a14fdbda78df06b5c79f (diff) | |
| download | linux-3.10-5a38f2c7c4dd53d5be097930902c108e362584a3.tar.gz linux-3.10-5a38f2c7c4dd53d5be097930902c108e362584a3.tar.bz2 linux-3.10-5a38f2c7c4dd53d5be097930902c108e362584a3.zip | |
HID: hidraw: fix numbered reports
Make hidraw not stick an extra byte on the beginning of an IN transfer
when a HID device contains multiple reports.
Signed-off-by: Alan Ott <alan@signal11.us>
Acked-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
| -rw-r--r-- | drivers/hid/hid-core.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index d25152baf5f..143e788b729 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -1043,13 +1043,8 @@ void hid_report_raw_event(struct hid_device *hid, int type, u8 *data, int size, if ((hid->claimed & HID_CLAIMED_HIDDEV) && hid->hiddev_report_event) hid->hiddev_report_event(hid, report); - if (hid->claimed & HID_CLAIMED_HIDRAW) { - /* numbered reports need to be passed with the report num */ - if (report_enum->numbered) - hidraw_report_event(hid, data - 1, size + 1); - else - hidraw_report_event(hid, data, size); - } + if (hid->claimed & HID_CLAIMED_HIDRAW) + hidraw_report_event(hid, data, size); for (a = 0; a < report->maxfield; a++) hid_input_field(hid, report->field[a], cdata, interrupt); |