Commit 52403cfb authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman

USB: ldusb: fix control-message timeout

USB control-message timeouts are specified in milliseconds, not jiffies.
Waiting 83 minutes for a transfer to complete is a bit excessive.

Fixes: 2824bd25 ("[PATCH] USB: add ldusb driver")
Cc: stable <stable@vger.kernel.org>     # 2.6.13
Reported-by: syzbot+a4fbb3bb76cda0ea4e58@syzkaller.appspotmail.com
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Link: https://lore.kernel.org/r/20191022153127.22295-1-johan@kernel.orgSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 88f6bf38
...@@ -581,7 +581,7 @@ static ssize_t ld_usb_write(struct file *file, const char __user *buffer, ...@@ -581,7 +581,7 @@ static ssize_t ld_usb_write(struct file *file, const char __user *buffer,
1 << 8, 0, 1 << 8, 0,
dev->interrupt_out_buffer, dev->interrupt_out_buffer,
bytes_to_write, bytes_to_write,
USB_CTRL_SET_TIMEOUT * HZ); USB_CTRL_SET_TIMEOUT);
if (retval < 0) if (retval < 0)
dev_err(&dev->intf->dev, dev_err(&dev->intf->dev,
"Couldn't submit HID_REQ_SET_REPORT %d\n", "Couldn't submit HID_REQ_SET_REPORT %d\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment