HID: Merge branch 'master' into for-3.10/hid-driver-transport-cleanups

Sync with Linus' tree. This is necessary to resolve build conflict
caused by dcd9006b1b053c7b ("HID: logitech-dj: do not directly call
hid_output_raw_report() during probe") which issues direct call to
usbhid_submit_report(), but that is gone in this branch and
hid_hw_request() has to be used instead.

Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --cc drivers/hid/hid-core.c
Simple merge

diff --cc drivers/hid/hid-logitech-dj.c
index 3cf62be2ca5d392a8998a202bc946794fb6ef1a5,8758f38c948c2022b45da342f15025228ea6b22d..d9043434ddb32f1e62129e4596a42d72043e6791
--- 1/drivers/hid/hid-logitech-dj.c
--- 2/drivers/hid/hid-logitech-dj.c
+++ b/drivers/hid/hid-logitech-dj.c
@@@ -466,11 -472,12 +471,12 @@@ static int logi_dj_recv_send_report(str
                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);
++      hid_hw_request(hdev, report, HID_REQ_SET_REPORT);
  
-       return (sent_bytes < 0) ? sent_bytes : 0;
+       return 0;
  }
  
  static int logi_dj_recv_query_paired_devices(struct dj_receiver_dev *djrcv_dev)