diff options
| author | Johan Hovold <jhovold@gmail.com> | 2012-10-29 10:56:27 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-30 13:19:32 -0700 |
| commit | 8da636d9b5f3af354458f5b7eadaf51f23017fdc (patch) | |
| tree | 719a1aab1ca30ca0b3430dd6bfb5afcb0a1b4473 /drivers/usb/serial/ftdi_sio.c | |
| parent | 755b6040fa62eab9d9105359cd5884910eef2df4 (diff) | |
| download | linux-3.10-8da636d9b5f3af354458f5b7eadaf51f23017fdc.tar.gz linux-3.10-8da636d9b5f3af354458f5b7eadaf51f23017fdc.tar.bz2 linux-3.10-8da636d9b5f3af354458f5b7eadaf51f23017fdc.zip | |
USB: ftdi_sio: optimise chars_in_buffer
No need to check hardware buffers when we know that the software
buffers are non-empty.
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial/ftdi_sio.c')
| -rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 9fe3a2e965a..b8bc9d0cb12 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c @@ -2098,6 +2098,8 @@ static int ftdi_chars_in_buffer(struct tty_struct *tty) int ret; chars = usb_serial_generic_chars_in_buffer(tty); + if (chars) + return chars; /* Check hardware buffer */ switch (priv->chip_type) { |