Eric Lee / smarc-ti-linux-kernel

2
Download as
Browse Code ยป

Commit f528bf4f57e43d1af4b2a5c97f09e43e0338c105

Authored by Johan Hovold
Committed by Greg Kroah-Hartman
1 parent 6b270fd4db
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

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: dcf010503966 ("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>

Showing 1 changed file with 3 additions and 2 deletions Side-by-side Diff

drivers/usb/serial/generic.c
Diff comments   View file @ f528bf4
... ... @@ -258,7 +258,8 @@
258 258 * character or at least one jiffy.
259 259 */
260 260 period = max_t(unsigned long, (10 * HZ / bps), 1);
261   - period = min_t(unsigned long, period, timeout);
  261 + if (timeout)
  262 + period = min_t(unsigned long, period, timeout);
262 263  
263 264 dev_dbg(&port->dev, "%s - timeout = %u ms, period = %u ms\n",
264 265 __func__, jiffies_to_msecs(timeout),
... ... @@ -268,7 +269,7 @@
268 269 schedule_timeout_interruptible(period);
269 270 if (signal_pending(current))
270 271 break;
271   - if (time_after(jiffies, expire))
  272 + if (timeout && time_after(jiffies, expire))
272 273 break;
273 274 }
274 275 }