diff options
| author | Johan Hovold <johan@kernel.org> | 2019-10-22 17:31:27 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-11-06 13:06:17 +0100 |
| commit | 8e2cccd6c5d1f24f25e6af713252e1c5f0beacfc (patch) | |
| tree | 0ddc45a4fec3babf9191acafb9a820bbe291c2ca | |
| parent | 3f1a7d903b8d33afb512c457448fa57c90551132 (diff) | |
| download | linux-stable-8e2cccd6c5d1f24f25e6af713252e1c5f0beacfc.tar.gz linux-stable-8e2cccd6c5d1f24f25e6af713252e1c5f0beacfc.tar.bz2 linux-stable-8e2cccd6c5d1f24f25e6af713252e1c5f0beacfc.zip | |
USB: ldusb: fix control-message timeout
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>
| -rw-r--r-- | drivers/usb/misc/ldusb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/misc/ldusb.c b/drivers/usb/misc/ldusb.c index 80c82f9667a1..320b06e0724b 100644 --- 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", |