From e83db51602d70e48da1266ad1f5f22ed97af717d Mon Sep 17 00:00:00 2001 From: Uwe Bonnes Date: Mon, 10 Oct 2011 17:24:46 +0200 Subject: [PATCH] --- yaml --- r: 265139 b: refs/heads/master c: 005b3cded789c2358b71cb7d2d410ad0df00e366 h: refs/heads/master i: 265137: 8e6446a5644dc241e0faaa03c3299acb93cc06e3 265135: 618f26e3421e4d33816d97b775fc19d702b4b06f v: v3 --- [refs] | 2 +- trunk/drivers/usb/serial/ftdi_sio.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7275ce3d242a..178c86c0ebeb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ac295f39249896f100ab1c49e2cbc269d176bf48 +refs/heads/master: 005b3cded789c2358b71cb7d2d410ad0df00e366 diff --git a/trunk/drivers/usb/serial/ftdi_sio.c b/trunk/drivers/usb/serial/ftdi_sio.c index 372ae5baa632..9699580331a1 100644 --- a/trunk/drivers/usb/serial/ftdi_sio.c +++ b/trunk/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 */