mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 01:10:04 +00:00
USB: serial: fix infinite wait_until_sent timeout
Make sure to handle an infinite timeout (0).
Note that wait_until_sent is currently never called with a 0-timeout
argument due to a bug in tty_wait_until_sent.
Fixes: dcf0105039
("USB: serial: add generic wait_until_sent
implementation")
Cc: stable <stable@vger.kernel.org> # v3.10
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
6b270fd4db
commit
f528bf4f57
1 changed files with 3 additions and 2 deletions
|
@ -258,7 +258,8 @@ void usb_serial_generic_wait_until_sent(struct tty_struct *tty, long timeout)
|
|||
* character or at least one jiffy.
|
||||
*/
|
||||
period = max_t(unsigned long, (10 * HZ / bps), 1);
|
||||
period = min_t(unsigned long, period, timeout);
|
||||
if (timeout)
|
||||
period = min_t(unsigned long, period, timeout);
|
||||
|
||||
dev_dbg(&port->dev, "%s - timeout = %u ms, period = %u ms\n",
|
||||
__func__, jiffies_to_msecs(timeout),
|
||||
|
@ -268,7 +269,7 @@ void usb_serial_generic_wait_until_sent(struct tty_struct *tty, long timeout)
|
|||
schedule_timeout_interruptible(period);
|
||||
if (signal_pending(current))
|
||||
break;
|
||||
if (time_after(jiffies, expire))
|
||||
if (timeout && time_after(jiffies, expire))
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue