diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-13 18:26:47 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-13 18:26:47 -0400 |
| commit | 9f48c89862e39b7f33b44123fc425cf901c89428 (patch) | |
| tree | 373886606ada8c2e0c362afbcce490af27d21552 /drivers/tty/serial/sccnxp.c | |
| parent | 2a211f320ee3d86835b40efd2948642482d3c933 (diff) | |
| parent | 1795cd9b3a91d4b5473c97f491d63892442212ab (diff) | |
Merge 3.16-rc5 into char-misc-next
This resolves a number of merge issues with changes in this tree and
Linus's tree at the same time.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/sccnxp.c')
| -rw-r--r-- | drivers/tty/serial/sccnxp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/sccnxp.c b/drivers/tty/serial/sccnxp.c index 5443b46345ed..e84b6a3bdd18 100644 --- a/drivers/tty/serial/sccnxp.c +++ b/drivers/tty/serial/sccnxp.c | |||
| @@ -665,7 +665,7 @@ static void sccnxp_set_termios(struct uart_port *port, | |||
| 665 | port->read_status_mask = SR_OVR; | 665 | port->read_status_mask = SR_OVR; |
| 666 | if (termios->c_iflag & INPCK) | 666 | if (termios->c_iflag & INPCK) |
| 667 | port->read_status_mask |= SR_PE | SR_FE; | 667 | port->read_status_mask |= SR_PE | SR_FE; |
| 668 | if (termios->c_iflag & (BRKINT | PARMRK)) | 668 | if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK)) |
| 669 | port->read_status_mask |= SR_BRK; | 669 | port->read_status_mask |= SR_BRK; |
| 670 | 670 | ||
| 671 | /* Set status ignore mask */ | 671 | /* Set status ignore mask */ |