|
@@ -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;
|
|
|
}
|
|
|
}
|