diff options
| author |   Sergey Organov <sorganov@gmail.com> | 2020-01-29 14:21:46 +0300 |
|---|---|---|
| committer |   Felipe Balbi <balbi@kernel.org> | 2020-02-11 08:45:45 +0200 |
| commit | e4bfded56cf39b8d02733c1e6ef546b97961e18a (patch) | |
| tree | 4c64ab8c2e1a830d13ad6aa8c13175f1fcb1edc8 | |
| parent | usb: gadget: ffs: ffs_aio_cancel(): Save/restore IRQ flags (diff) | |
| download | linux-dev-e4bfded56cf39b8d02733c1e6ef546b97961e18a.tar.xz linux-dev-e4bfded56cf39b8d02733c1e6ef546b97961e18a.zip | |
usb: gadget: serial: fix Tx stall after buffer overflow
Symptom: application opens /dev/ttyGS0 and starts sending (writing) to
it while either USB cable is not connected, or nobody listens on the
other side of the cable. If driver circular buffer overflows before
connection is established, no data will be written to the USB layer
until/unless /dev/ttyGS0 is closed and re-opened again by the
application (the latter besides having no means of being notified about
the event of establishing of the connection.)
Fix: on open and/or connect, kick Tx to flush circular buffer data to
USB layer.
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Reviewed-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: Felipe Balbi <balbi@kernel.org>
| -rw-r--r-- | drivers/usb/gadget/function/u_serial.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/gadget/function/u_serial.c b/drivers/usb/gadget/function/u_serial.c index f986e5c55974..8167d379e115 100644 --- a/drivers/usb/gadget/function/u_serial.c +++ b/drivers/usb/gadget/function/u_serial.c @@ -561,8 +561,10 @@ static int gs_start_io(struct gs_port *port) port->n_read = 0; started = gs_start_rx(port); - /* unblock any pending writes into our circular buffer */ if (started) { + gs_start_tx(port); + /* Unblock any pending writes into our circular buffer, in case + * we didn't in gs_start_tx() */ tty_wakeup(port->port.tty); } else { gs_free_requests(ep, head, &port->read_allocated); |