mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
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>
This commit is contained in:
parent
3c86726cfe
commit
3a75b24949
1 changed files with 14 additions and 5 deletions
|
@ -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:
|
||||
|
|
Loading…
Reference in a new issue