diff options
| author | Andrej Shadura <andrew.shadura@collabora.co.uk> | 2021-10-19 17:29:17 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2021-10-27 10:17:08 +0200 |
| commit | 43775e62c4b784f44a159e13ba80e6146a42d502 (patch) | |
| tree | bc67d48a4bcfaea144a0b2736910c329584f317b /drivers/hid/hid-u2fzero.c | |
| parent | b7abf78b7a6c4a29a6e0ba0bb883fe44a2f3d693 (diff) | |
| download | linux-stable-43775e62c4b784f44a159e13ba80e6146a42d502.tar.gz linux-stable-43775e62c4b784f44a159e13ba80e6146a42d502.tar.bz2 linux-stable-43775e62c4b784f44a159e13ba80e6146a42d502.zip | |
HID: u2fzero: properly handle timeouts in usb_submit_urb
The wait_for_completion_timeout function returns 0 if timed out or a
positive value if completed. Hence, "less than zero" comparison always
misses timeouts and doesn't kill the URB as it should, leading to
re-sending it while it is active.
Fixes: 42337b9d4d95 ("HID: add driver for U2F Zero built-in LED and RNG")
Signed-off-by: Andrej Shadura <andrew.shadura@collabora.co.uk>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-u2fzero.c')
| -rw-r--r-- | drivers/hid/hid-u2fzero.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/hid-u2fzero.c b/drivers/hid/hid-u2fzero.c index 94f78ffb76d0..67ae2b18e33a 100644 --- a/drivers/hid/hid-u2fzero.c +++ b/drivers/hid/hid-u2fzero.c @@ -132,7 +132,7 @@ static int u2fzero_recv(struct u2fzero_device *dev, ret = (wait_for_completion_timeout( &ctx.done, msecs_to_jiffies(USB_CTRL_SET_TIMEOUT))); - if (ret < 0) { + if (ret == 0) { usb_kill_urb(dev->urb); hid_err(hdev, "urb submission timed out"); } else { |