summaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-logitech-dj.c
diff options
context:
space:
mode:
authorAndrew de los Reyes <adlr@chromium.org>2013-02-18 18:20:22 +0100
committerJiri Kosina <jkosina@suse.cz>2013-03-01 14:14:35 +0100
commita9dd22b73085734735cfa07398451b061626cc53 (patch)
tree94e5eee4d893c442caac3aac511175e270eb6377 /drivers/hid/hid-logitech-dj.c
parentHID: Separate struct hid_device's driver_lock into two locks. (diff)
downloadlinux-a9dd22b73085734735cfa07398451b061626cc53.tar.xz
linux-a9dd22b73085734735cfa07398451b061626cc53.zip
HID: logitech-dj: Allow incoming packets during probe().
Historically, logitech-dj communicated with the device during probe() to query the list of devices attached. Later, a change was introduced to hid-core that prevented incoming packets for a device during probe(), as many drivers are unable to handle such input. That change broke the device enumeration in logitech-dj, so commit 596264082f10dd4a56 was introduced to workaround that by waiting for normal input before enumerating devices. Now that drivers can opt-in to receive input during probe, this patch changes logitech-dj to do that, so that it can successfully complete enumeration of devices during probe(). Signed-off-by: Andrew de los Reyes <adlr@chromium.org> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-logitech-dj.c')
-rw-r--r--drivers/hid/hid-logitech-dj.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-logitech-dj.c
index 9500f2f3f8fe..bf647ef18086 100644
--- a/drivers/hid/hid-logitech-dj.c
+++ b/drivers/hid/hid-logitech-dj.c
@@ -803,6 +803,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 "