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>

1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/tty/serial/sunsab.c b/drivers/tty/serial/sunsab.c
index 5faa8e905e98..2f57df9a71d9 100644
--- a/drivers/tty/serial/sunsab.c
+++ b/drivers/tty/serial/sunsab.c
@@ -427,6 +427,9 @@ static void sunsab_start_tx(struct uart_port *port)
         struct circ_buf *xmit = &up->port.state->xmit;
         int i;
 
+        if (uart_circ_empty(xmit))
+                return;
+
         up->interrupt_mask1 &= ~(SAB82532_IMR1_ALLS|SAB82532_IMR1_XPR);
         writeb(up->interrupt_mask1, &up->regs->w.imr1);
         
@@ -719,7 +722,7 @@ static void sunsab_convert_to_sab(struct uart_sunsab_port *up, unsigned int cfla
         if (iflag & INPCK)
                 up->port.read_status_mask |= (SAB82532_ISR0_PERR |
                                               SAB82532_ISR0_FERR);
-        if (iflag & (BRKINT | PARMRK))
+        if (iflag & (IGNBRK | BRKINT | PARMRK))
                 up->port.read_status_mask |= (SAB82532_ISR1_BRK << 8);
 
         /*