HID: hidraw: replace hid_output_raw_report() calls by appropriates ones
authorBenjamin Tissoires <benjamin.tissoires@redhat.com>
Thu, 20 Feb 2014 20:24:50 +0000 (15:24 -0500)
committerJiri Kosina <jkosina@suse.cz>
Mon, 24 Feb 2014 16:23:15 +0000 (17:23 +0100)
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>
drivers/hid/hidraw.c

index f8708c93f85cec5a5a780d0b09282aa803e32f66..2cc484c0017b51e00ad8f0b714c4c3d40600e518 100644 (file)
@@ -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: