Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 354828
b: refs/heads/master
c: f548b96
h: refs/heads/master
v: v3
  • Loading branch information
Alexander Shiyan authored and Greg Kroah-Hartman committed Jan 21, 2013
1 parent 7ba3e51 commit 6a9b085
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: c098020d0368ded1c6ba8d7b612feffe067509a6
refs/heads/master: f548b96de684c86c72cd7ba019c03a7afe94fd53
7 changes: 6 additions & 1 deletion trunk/drivers/tty/serial/sccnxp.c
Original file line number Diff line number Diff line change
Expand Up @@ -305,14 +305,19 @@ static void sccnxp_handle_rx(struct uart_port *port)
if (unlikely(sr)) {
if (sr & SR_BRK) {
port->icount.brk++;
sccnxp_port_write(port, SCCNXP_CR_REG,
CR_CMD_BREAK_RESET);
if (uart_handle_break(port))
continue;
} else if (sr & SR_PE)
port->icount.parity++;
else if (sr & SR_FE)
port->icount.frame++;
else if (sr & SR_OVR)
else if (sr & SR_OVR) {
port->icount.overrun++;
sccnxp_port_write(port, SCCNXP_CR_REG,
CR_CMD_STATUS_RESET);
}

sr &= port->read_status_mask;
if (sr & SR_BRK)
Expand Down

0 comments on commit 6a9b085

Please sign in to comment.