diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2013-08-09 11:34:19 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-08-09 11:34:19 +0200 |
| commit | 8e5654ce6914b950b42d1f896f3d8a75fbf307ae (patch) | |
| tree | f03473054ad2582e5322571eb84c00703362df63 /drivers/hid/hid-logitech-dj.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik... (diff) | |
| download | linux-8e5654ce6914b950b42d1f896f3d8a75fbf307ae.tar.xz linux-8e5654ce6914b950b42d1f896f3d8a75fbf307ae.zip | |
Revert "HID: hid-logitech-dj: querying_devices was never set"
This reverts commit 407a2c2a4d85100c8c67953e4bac2f4a6c942335.
Explanation provided by Benjamin Tissoires:
Commit "HID: hid-logitech-dj, querying_devices was never set" activate
a flag which guarantees that we do not ask the receiver for too many
enumeration. When the flag is set, each following enumeration call is
discarded (the usb request is not forwarded to the receiver). The flag
is then released when the driver receive a pairing information event,
which normally follows the enumeration request.
However, the USB3 bug makes the driver think the enumeration request
has been forwarded to the receiver. However, it is actually not the
case because the USB stack returns -EPIPE. So, when a new unknown
device appears, the workaround consisting in asking for a new
enumeration is not working anymore: this new enumeration is discarded
because of the flag, which is never reset.
A solution could be to trigger a timeout before releasing it, but for
now, let's just revert the patch.
Reported-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
Tested-by: Sune Mølgaard <sune@molgaard.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to '')
| -rw-r--r-- | drivers/hid/hid-logitech-dj.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-logitech-dj.c index 7a5764843bfb..cd33084c7860 100644 --- a/drivers/hid/hid-logitech-dj.c +++ b/drivers/hid/hid-logitech-dj.c @@ -488,8 +488,6 @@ static int logi_dj_recv_query_paired_devices(struct dj_receiver_dev *djrcv_dev) if (djrcv_dev->querying_devices) return 0; - djrcv_dev->querying_devices = true; - dj_report = kzalloc(sizeof(struct dj_report), GFP_KERNEL); if (!dj_report) return -ENOMEM; |