Revert "HID: hid-logitech-dj: querying_devices was never set"

[linux-imx.git] / drivers / hid / hid-logitech-dj.c

diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-logitech-dj.c
index 8758f38c948c2022b45da342f15025228ea6b22d..cd33084c78602146d42efca60e358d08f00da219 100644 (file)
--- a/drivers/hid/hid-logitech-dj.c
+++ b/drivers/hid/hid-logitech-dj.c
@@ -27,7 +27,6 @@
 #include <linux/module.h>
 #include <linux/usb.h>
 #include <asm/unaligned.h>
-#include "usbhid/usbhid.h"
 #include "hid-ids.h"
 #include "hid-logitech-dj.h"
 
@@ -475,7 +474,7 @@ static int logi_dj_recv_send_report(struct dj_receiver_dev *djrcv_dev,
        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 0;
 }
@@ -644,7 +643,7 @@ static int logi_dj_ll_input_event(struct input_dev *dev, unsigned int type,
        hid_set_field(report->field[0], 1, REPORT_TYPE_LEDS);
        hid_set_field(report->field[0], 2, data[1]);
 
-       usbhid_submit_report(dj_rcv_hiddev, report, USB_DIR_OUT);
+       hid_hw_request(dj_rcv_hiddev, report, HID_REQ_SET_REPORT);
 
        return 0;
 
@@ -809,6 +808,9 @@ static int logi_dj_probe(struct hid_device *hdev,
                goto llopen_failed;
        }
 
+       /* Allow incoming packets to arrive: */
+       hid_device_io_start(hdev);
+
        retval = logi_dj_recv_query_paired_devices(djrcv_dev);
        if (retval < 0) {
                dev_err(&hdev->dev, "%s:logi_dj_recv_query_paired_devices "