Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 265139
b: refs/heads/master
c: 005b3cd
h: refs/heads/master
i:
  265137: 8e6446a
  265135: 618f26e
v: v3
  • Loading branch information
Uwe Bonnes authored and Greg Kroah-Hartman committed Oct 18, 2011
1 parent f0ef711 commit e83db51
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ac295f39249896f100ab1c49e2cbc269d176bf48
refs/heads/master: 005b3cded789c2358b71cb7d2d410ad0df00e366
7 changes: 6 additions & 1 deletion trunk/drivers/usb/serial/ftdi_sio.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit e83db51

Please sign in to comment.