summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Tissoires <benjamin.tissoires@redhat.com>2014-03-08 22:52:41 -0500
committerJiri Kosina <jkosina@suse.cz>2014-03-14 15:29:55 +0100
commit866e4797b4e8100f5abcf2bfd3f7843dc40306cd (patch)
tree191f4d029e1b9e86e31f28a100d6900363352470
parent293e483defe499f3c33dfd6e022bf5d0b01ff27f (diff)
downloadblackbird-obmc-linux-866e4797b4e8100f5abcf2bfd3f7843dc40306cd.tar.gz
blackbird-obmc-linux-866e4797b4e8100f5abcf2bfd3f7843dc40306cd.zip
HID: cp2112: remove the last hid_output_raw_report() call
tests have shown that output reports use hid_hw_output_report(). 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/hid-cp2112.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/hid/hid-cp2112.c b/drivers/hid/hid-cp2112.c
index 3913eb9fec2a..56be85a9a77c 100644
--- a/drivers/hid/hid-cp2112.c
+++ b/drivers/hid/hid-cp2112.c
@@ -290,7 +290,12 @@ static int cp2112_hid_output(struct hid_device *hdev, u8 *data, size_t count,
if (!buf)
return -ENOMEM;
- ret = hdev->hid_output_raw_report(hdev, buf, count, report_type);
+ if (report_type == HID_OUTPUT_REPORT)
+ ret = hid_hw_output_report(hdev, buf, count);
+ else
+ ret = hid_hw_raw_request(hdev, buf[0], buf, count, report_type,
+ HID_REQ_SET_REPORT);
+
kfree(buf);
return ret;
}
OpenPOWER on IntegriCloud