Merge branch 'for-3.9/upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

Pull HID fix from Jiri Kosina:
 "Bugfix for a long-standing bug in logitech-dj driver causing all sorts
  of random initialization problems, finally debugged by Benjamin
  Tissoires with help of Bob Bowles."

* 'for-3.9/upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: logitech-dj: do not directly call hid_output_raw_report() during probe

1 files changed, 14 insertions, 8 deletions

diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-logitech-dj.c
index 9500f2f3f8fe..8758f38c948c 100644
--- a/drivers/hid/hid-logitech-dj.c
+++ b/drivers/hid/hid-logitech-dj.c
@@ -459,19 +459,25 @@ static int logi_dj_recv_send_report(struct dj_receiver_dev *djrcv_dev,
                                     struct dj_report *dj_report)
 {
         struct hid_device *hdev = djrcv_dev->hdev;
-        int sent_bytes;
+        struct hid_report *report;
+        struct hid_report_enum *output_report_enum;
+        u8 *data = (u8 *)(&dj_report->device_index);
+        int i;
 
-        if (!hdev->hid_output_raw_report) {
-                dev_err(&hdev->dev, "%s:"
-                        "hid_output_raw_report is null\n", __func__);
+        output_report_enum = &hdev->report_enum[HID_OUTPUT_REPORT];
+        report = output_report_enum->report_id_hash[REPORT_ID_DJ_SHORT];
+
+        if (!report) {
+                dev_err(&hdev->dev, "%s: unable to find dj report\n", __func__);
                 return -ENODEV;
         }
 
-        sent_bytes = hdev->hid_output_raw_report(hdev, (u8 *) dj_report,
-                                                 sizeof(struct dj_report),
-                                                 HID_OUTPUT_REPORT);
+        for (i = 0; i < report->field[0]->report_count; i++)
+                report->field[0]->value[i] = data[i];
+
+        usbhid_submit_report(hdev, report, USB_DIR_OUT);
 
-        return (sent_bytes < 0) ? sent_bytes : 0;
+        return 0;
 }
 
 static int logi_dj_recv_query_paired_devices(struct dj_receiver_dev *djrcv_dev)