projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3f1a7d9
)
USB: ldusb: fix control-message timeout
author
Johan Hovold
<johan@kernel.org>
Tue, 22 Oct 2019 15:31:27 +0000
(17:31 +0200)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Wed, 6 Nov 2019 12:06:17 +0000
(13:06 +0100)
commit
52403cfbc635d28195167618690595013776ebde
upstream.
USB control-message timeouts are specified in milliseconds, not jiffies.
Waiting 83 minutes for a transfer to complete is a bit excessive.
Fixes:
2824bd250f0b
("[PATCH] USB: add ldusb driver")
Cc: stable <stable@vger.kernel.org> # 2.6.13
Reported-by: syzbot+a4fbb3bb76cda0ea4e58@syzkaller.appspotmail.com
Signed-off-by: Johan Hovold <johan@kernel.org>
Link:
https://lore.kernel.org/r/20191022153127.22295-1-johan@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/misc/ldusb.c
patch
|
blob
|
history
diff --git
a/drivers/usb/misc/ldusb.c
b/drivers/usb/misc/ldusb.c
index
80c82f9
..
320b06e
100644
(file)
--- a/
drivers/usb/misc/ldusb.c
+++ b/
drivers/usb/misc/ldusb.c
@@
-580,7
+580,7
@@
static ssize_t ld_usb_write(struct file *file, const char __user *buffer,
1 << 8, 0,
dev->interrupt_out_buffer,
bytes_to_write,
- USB_CTRL_SET_TIMEOUT
* HZ
);
+ USB_CTRL_SET_TIMEOUT);
if (retval < 0)
dev_err(&dev->intf->dev,
"Couldn't submit HID_REQ_SET_REPORT %d\n",