Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 267309
b: refs/heads/master
c: 019dc9e
h: refs/heads/master
i:
  267307: b618df9
v: v3
  • Loading branch information
Hui Wang authored and Greg Kroah-Hartman committed Aug 24, 2011
1 parent 656c79a commit 4315abf
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 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: 9a234349de01de3437784c0ef03d95353f055fae
refs/heads/master: 019dc9ea8d528eb3640bbba604e1e5a2f6994b1f
10 changes: 7 additions & 3 deletions trunk/drivers/tty/serial/imx.c
Original file line number Diff line number Diff line change
Expand Up @@ -508,8 +508,10 @@ static irqreturn_t imx_rxint(int irq, void *dev_id)
if (uart_handle_sysrq_char(&sport->port, (unsigned char)rx))
continue;

if (rx & (URXD_PRERR | URXD_OVRRUN | URXD_FRMERR) ) {
if (rx & URXD_PRERR)
if (unlikely(rx & URXD_ERR)) {
if (rx & URXD_BRK)
sport->port.icount.brk++;
else if (rx & URXD_PRERR)
sport->port.icount.parity++;
else if (rx & URXD_FRMERR)
sport->port.icount.frame++;
Expand All @@ -524,7 +526,9 @@ static irqreturn_t imx_rxint(int irq, void *dev_id)

rx &= sport->port.read_status_mask;

if (rx & URXD_PRERR)
if (rx & URXD_BRK)
flg = TTY_BREAK;
else if (rx & URXD_PRERR)
flg = TTY_PARITY;
else if (rx & URXD_FRMERR)
flg = TTY_FRAME;
Expand Down

0 comments on commit 4315abf

Please sign in to comment.