diff options
| author | Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2014-02-20 21:24:50 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2014-02-24 17:23:15 +0100 |
| commit | 3a75b24949a8d34d2014866006e30dc69dd567c8 (patch) | |
| tree | 07bfa020997b5a9e6f7426422e24295657aea181 | |
| parent | HID: make .raw_request mandatory (diff) | |
| download | linux-3a75b24949a8d34d2014866006e30dc69dd567c8.tar.xz linux-3a75b24949a8d34d2014866006e30dc69dd567c8.zip | |
HID: hidraw: replace hid_output_raw_report() calls by appropriates ones
Remove hid_output_raw_report() call as it is not a ll_driver callbacj,
and switch to the hid_hw_* implementation. USB-HID used to fallback
into SET_REPORT when there were no output interrupt endpoint,
so emulating this if hid_hw_output_report() returns -ENOSYS.
Reviewed-by: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| -rw-r--r-- | drivers/hid/hidraw.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c index f8708c93f85c..2cc484c0017b 100644 --- a/drivers/hid/hidraw.c +++ b/drivers/hid/hidraw.c @@ -123,10 +123,6 @@ static ssize_t hidraw_send_report(struct file *file, const char __user *buffer, dev = hidraw_table[minor]->hid; - if (!dev->hid_output_raw_report) { - ret = -ENODEV; - goto out; - } if (count > HID_MAX_BUFFER_SIZE) { hid_warn(dev, "pid %d passed too large report\n", @@ -153,7 +149,20 @@ static ssize_t hidraw_send_report(struct file *file, const char __user *buffer, goto out_free; } - ret = hid_output_raw_report(dev, buf, count, report_type); + if (report_type == HID_OUTPUT_REPORT) { + ret = hid_hw_output_report(dev, buf, count); + /* + * compatibility with old implementation of USB-HID and I2C-HID: + * if the device does not support receiving output reports, + * on an interrupt endpoint, fallback to SET_REPORT HID command. + */ + if (ret != -ENOSYS) + goto out_free; + } + + ret = hid_hw_raw_request(dev, buf[0], buf, count, report_type, + HID_REQ_SET_REPORT); + out_free: kfree(buf); out: |