diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-01 08:44:59 +1100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-01 08:44:59 +1100 |
| commit | cf5425bfcd6909f9831a00bc06ccb9a5b163766a (patch) | |
| tree | 0b419af2c3f3d225148c38228ed6d95fae7269da /drivers/hid/i2c-hid | |
| parent | Merge tag 'nfs-for-3.8-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs (diff) | |
| parent | HID: i2c-hid: fix i2c_hid_output_raw_report (diff) | |
| download | linux-dev-cf5425bfcd6909f9831a00bc06ccb9a5b163766a.tar.xz linux-dev-cf5425bfcd6909f9831a00bc06ccb9a5b163766a.zip | |
Merge branch 'for-3.8/upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
PullHID fixes from Jiri Kosina:
- fix i2c-hid and hidraw interaction, by Benjamin Tissoires
- a quirk to make a particular device (Formosa IR receiver) work
properly, by Nicholas Santos
* 'for-3.8/upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: i2c-hid: fix i2c_hid_output_raw_report
HID: usbhid: quirk for Formosa IR receiver
HID: remove x bit from sensor doc
Diffstat (limited to 'drivers/hid/i2c-hid')
| -rw-r--r-- | drivers/hid/i2c-hid/i2c-hid.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/drivers/hid/i2c-hid/i2c-hid.c b/drivers/hid/i2c-hid/i2c-hid.c index 12e4fdc810bf..e766b5614ef5 100644 --- a/drivers/hid/i2c-hid/i2c-hid.c +++ b/drivers/hid/i2c-hid/i2c-hid.c @@ -540,13 +540,24 @@ static int i2c_hid_output_raw_report(struct hid_device *hid, __u8 *buf, { struct i2c_client *client = hid->driver_data; int report_id = buf[0]; + int ret; if (report_type == HID_INPUT_REPORT) return -EINVAL; - return i2c_hid_set_report(client, + if (report_id) { + buf++; + count--; + } + + ret = i2c_hid_set_report(client, report_type == HID_FEATURE_REPORT ? 0x03 : 0x02, report_id, buf, count); + + if (report_id && ret >= 0) + ret++; /* add report_id to the number of transfered bytes */ + + return ret; } static int i2c_hid_parse(struct hid_device *hid) |