1 files changed, 3 insertions, 1 deletions

diff --git a/drivers/tty/serial/ip22zilog.c b/drivers/tty/serial/ip22zilog.c
index 1d9420548e16..99b7b8697861 100644
--- a/drivers/tty/serial/ip22zilog.c
+++ b/drivers/tty/serial/ip22zilog.c
@@ -603,6 +603,8 @@ static void ip22zilog_start_tx(struct uart_port *port)
         } else {
                 struct circ_buf *xmit = &port->state->xmit;
 
+                if (uart_circ_empty(xmit))
+                        return;
                 writeb(xmit->buf[xmit->tail], &channel->data);
                 ZSDELAY();
                 ZS_WSYNC(channel);
@@ -850,7 +852,7 @@ ip22zilog_convert_to_zs(struct uart_ip22zilog_port *up, unsigned int cflag,
         up->port.read_status_mask = Rx_OVR;
         if (iflag & INPCK)
                 up->port.read_status_mask |= CRC_ERR | PAR_ERR;
-        if (iflag & (BRKINT | PARMRK))
+        if (iflag & (IGNBRK | BRKINT | PARMRK))
                 up->port.read_status_mask |= BRK_ABRT;
 
         up->port.ignore_status_mask = 0;