Merge tag 'tty-3.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

Pull tty/serial bugfixes from Greg KH:
 "Here are some tty / serial driver bugfixes for 3.16-rc2 that resolve
  some reported issues.  The samsung driver build error itself has been
  reported by a bunch of people, sorry about that one.  The others are
  all tiny and everyone seems to like them in linux-next so far"

* tag 'tty-3.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  tty/serial: fix 8250 early console option passing to regular console
  tty: Correct INPCK handling
  serial: Fix IGNBRK handling
  serial: samsung: Fix build error

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/tty/serial/vr41xx_siu.c b/drivers/tty/serial/vr41xx_siu.c
index a63c14bc9a24..db0c8a4ab03e 100644
--- a/drivers/tty/serial/vr41xx_siu.c
+++ b/drivers/tty/serial/vr41xx_siu.c
@@ -559,7 +559,7 @@ static void siu_set_termios(struct uart_port *port, struct ktermios *new,
         port->read_status_mask = UART_LSR_THRE | UART_LSR_OE | UART_LSR_DR;
         if (c_iflag & INPCK)
                 port->read_status_mask |= UART_LSR_FE | UART_LSR_PE;
-        if (c_iflag & (BRKINT | PARMRK))
+        if (c_iflag & (IGNBRK | BRKINT | PARMRK))
                 port->read_status_mask |= UART_LSR_BI;
 
         port->ignore_status_mask = 0;