aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/usb/serial/ftdi_sio.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 06b5d75dffc6..9fe3a2e965ad 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -2093,16 +2093,11 @@ static int ftdi_chars_in_buffer(struct tty_struct *tty)
2093{ 2093{
2094 struct usb_serial_port *port = tty->driver_data; 2094 struct usb_serial_port *port = tty->driver_data;
2095 struct ftdi_private *priv = usb_get_serial_port_data(port); 2095 struct ftdi_private *priv = usb_get_serial_port_data(port);
2096 unsigned long flags;
2097 int chars; 2096 int chars;
2098 unsigned char *buf; 2097 unsigned char *buf;
2099 int ret; 2098 int ret;
2100 2099
2101 /* Check software buffer (code from 2100 chars = usb_serial_generic_chars_in_buffer(tty);
2102 * usb_serial_generic_chars_in_buffer()) */
2103 spin_lock_irqsave(&port->lock, flags);
2104 chars = kfifo_len(&port->write_fifo) + port->tx_bytes;
2105 spin_unlock_irqrestore(&port->lock, flags);
2106 2101
2107 /* Check hardware buffer */ 2102 /* Check hardware buffer */
2108 switch (priv->chip_type) { 2103 switch (priv->chip_type) {