openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

USB: sierra: fix characters being dropped at close 

Fix characters potentially being dropped at close due to missing
chars_in_buffer implementation.

Note that currently the write urbs are not even killed at close (will be
fixed separately), but this could still lead to dropped data since we
have lowered DTR/RTS.

Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Johan Hovold 2014-05-26 19:22:55 +02:00 committed by Greg Kroah-Hartman
parent 80cc0fcbda
commit 93670599fc
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/usb/serial/sierra.c
View File

@ -675,6 +675,23 @@ static int sierra_write_room(struct tty_struct *tty)
return 2048; return 2048;
} }
static int sierra_chars_in_buffer(struct tty_struct *tty)
{
struct usb_serial_port *port = tty->driver_data;
struct sierra_port_private *portdata = usb_get_serial_port_data(port);
unsigned long flags;
int chars;
/* NOTE: This overcounts somewhat. */
spin_lock_irqsave(&portdata->lock, flags);
chars = portdata->outstanding_urbs * MAX_TRANSFER;
spin_unlock_irqrestore(&portdata->lock, flags);
dev_dbg(&port->dev, "%s - %d\n", __func__, chars);
return chars;
}
static void sierra_stop_rx_urbs(struct usb_serial_port *port) static void sierra_stop_rx_urbs(struct usb_serial_port *port)
{ {
int i; int i;
@ -1060,6 +1077,7 @@ static struct usb_serial_driver sierra_device = {
.dtr_rts = sierra_dtr_rts, .dtr_rts = sierra_dtr_rts,
.write = sierra_write, .write = sierra_write,
.write_room = sierra_write_room, .write_room = sierra_write_room,
.chars_in_buffer = sierra_chars_in_buffer,
.set_termios = sierra_set_termios, .set_termios = sierra_set_termios,
.tiocmget = sierra_tiocmget, .tiocmget = sierra_tiocmget,
.tiocmset = sierra_tiocmset, .tiocmset = sierra_tiocmset,