summaryrefslogtreecommitdiff
path: root/drivers/usb
diff options
context:
space:
mode:
authorUwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de>2011-10-10 17:24:46 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2011-10-18 13:46:30 -0700
commit005b3cded789c2358b71cb7d2d410ad0df00e366 (patch)
tree8a7d666aeaa4dded996f698e4f53f189b616c8df /drivers/usb
parentac295f39249896f100ab1c49e2cbc269d176bf48 (diff)
downloadlinux-3.10-005b3cded789c2358b71cb7d2d410ad0df00e366.tar.gz
linux-3.10-005b3cded789c2358b71cb7d2d410ad0df00e366.tar.bz2
linux-3.10-005b3cded789c2358b71cb7d2d410ad0df00e366.zip
USB: ftdi_sio.c:Fill MSR fields of the ftdi async_icount structure
Signed-off-by: Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/serial/ftdi_sio.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 372ae5baa63..9699580331a 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -1974,15 +1974,20 @@ static int ftdi_process_packet(struct tty_struct *tty,
* over framing errors */
if (packet[1] & FTDI_RS_BI) {
flag = TTY_BREAK;
+ priv->icount.brk++;
usb_serial_handle_break(port);
} else if (packet[1] & FTDI_RS_PE) {
flag = TTY_PARITY;
+ priv->icount.parity++;
} else if (packet[1] & FTDI_RS_FE) {
flag = TTY_FRAME;
+ priv->icount.frame++;
}
/* Overrun is special, not associated with a char */
- if (packet[1] & FTDI_RS_OE)
+ if (packet[1] & FTDI_RS_OE) {
+ priv->icount.overrun++;
tty_insert_flip_char(tty, 0, TTY_OVERRUN);
+ }
}
/* save if the transmitter is empty or not */