39 files changed, 70 insertions, 40 deletions

diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c
index 27f7ad6b74c1..7a91c6d1eb7d 100644
--- a/drivers/tty/serial/8250/8250_core.c
+++ b/drivers/tty/serial/8250/8250_core.c
@@ -2357,7 +2357,7 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios,
         port->read_status_mask = UART_LSR_OE | UART_LSR_THRE | UART_LSR_DR;
         if (termios->c_iflag & INPCK)
                 port->read_status_mask |= UART_LSR_FE | UART_LSR_PE;
-        if (termios->c_iflag & (BRKINT | PARMRK))
+        if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK))
                 port->read_status_mask |= UART_LSR_BI;
 
         /*
diff --git a/drivers/tty/serial/8250/8250_early.c b/drivers/tty/serial/8250/8250_early.c
index cfef801a49d4..4858b8a99d3b 100644
--- a/drivers/tty/serial/8250/8250_early.c
+++ b/drivers/tty/serial/8250/8250_early.c
@@ -144,8 +144,11 @@ static int __init early_serial8250_setup(struct earlycon_device *device,
         if (!(device->port.membase || device->port.iobase))
                 return 0;
 
-        if (!device->baud)
+        if (!device->baud) {
                 device->baud = probe_baud(&device->port);
+                snprintf(device->options, sizeof(device->options), "%u",
+                         device->baud);
+        }
 
         init_port(device);
 
diff --git a/drivers/tty/serial/altera_uart.c b/drivers/tty/serial/altera_uart.c
index 501667e3e3f5..323376668b72 100644
--- a/drivers/tty/serial/altera_uart.c
+++ b/drivers/tty/serial/altera_uart.c
@@ -185,6 +185,12 @@ static void altera_uart_set_termios(struct uart_port *port,
         uart_update_timeout(port, termios->c_cflag, baud);
         altera_uart_writel(port, baudclk, ALTERA_UART_DIVISOR_REG);
         spin_unlock_irqrestore(&port->lock, flags);
+
+        /*
+         * FIXME: port->read_status_mask and port->ignore_status_mask
+         * need to be initialized based on termios settings for
+         * INPCK, IGNBRK, IGNPAR, PARMRK, BRKINT
+         */
 }
 
 static void altera_uart_rx_chars(struct altera_uart *pp)
diff --git a/drivers/tty/serial/amba-pl010.c b/drivers/tty/serial/amba-pl010.c
index 01c9e72433e1..971af1e22d0f 100644
--- a/drivers/tty/serial/amba-pl010.c
+++ b/drivers/tty/serial/amba-pl010.c
@@ -420,7 +420,7 @@ pl010_set_termios(struct uart_port *port, struct ktermios *termios,
         uap->port.read_status_mask = UART01x_RSR_OE;
         if (termios->c_iflag & INPCK)
                 uap->port.read_status_mask |= UART01x_RSR_FE | UART01x_RSR_PE;
-        if (termios->c_iflag & (BRKINT | PARMRK))
+        if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK))
                 uap->port.read_status_mask |= UART01x_RSR_BE;
 
         /*
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index 908a6e3142a2..0e26dcbd5ea4 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -1744,7 +1744,7 @@ pl011_set_termios(struct uart_port *port, struct ktermios *termios,
         port->read_status_mask = UART011_DR_OE | 255;
         if (termios->c_iflag & INPCK)
                 port->read_status_mask |= UART011_DR_FE | UART011_DR_PE;
-        if (termios->c_iflag & (BRKINT | PARMRK))
+        if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK))
                 port->read_status_mask |= UART011_DR_BE;
 
         /*
diff --git a/drivers/tty/serial/arc_uart.c b/drivers/tty/serial/arc_uart.c
index c9f5c9dcc15c..008c223eaf26 100644
--- a/drivers/tty/serial/arc_uart.c
+++ b/drivers/tty/serial/arc_uart.c
@@ -177,7 +177,7 @@ static void arc_serial_tx_chars(struct arc_uart_port *uart)
                 uart->port.icount.tx++;
                 uart->port.x_char = 0;
                 sent = 1;
-        } else if (xmit->tail != xmit->head) {  /* TODO: uart_circ_empty */
+        } else if (!uart_circ_empty(xmit)) {
                 ch = xmit->buf[xmit->tail];
                 xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
                 uart->port.icount.tx++;
diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c
index 3fceae099c44..c4f750314100 100644
--- a/drivers/tty/serial/atmel_serial.c
+++ b/drivers/tty/serial/atmel_serial.c
@@ -1932,7 +1932,7 @@ static void atmel_set_termios(struct uart_port *port, struct ktermios *termios,
         port->read_status_mask = ATMEL_US_OVRE;
         if (termios->c_iflag & INPCK)
                 port->read_status_mask |= (ATMEL_US_FRAME | ATMEL_US_PARE);
-        if (termios->c_iflag & (BRKINT | PARMRK))
+        if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK))
                 port->read_status_mask |= ATMEL_US_RXBRK;
 
         if (atmel_use_pdc_rx(port))
diff --git a/drivers/tty/serial/bcm63xx_uart.c b/drivers/tty/serial/bcm63xx_uart.c
index a47421e4627c..231519022b73 100644
--- a/drivers/tty/serial/bcm63xx_uart.c
+++ b/drivers/tty/serial/bcm63xx_uart.c
@@ -567,7 +567,7 @@ static void bcm_uart_set_termios(struct uart_port *port,
                 port->read_status_mask |= UART_FIFO_FRAMEERR_MASK;
                 port->read_status_mask |= UART_FIFO_PARERR_MASK;
         }
-        if (new->c_iflag & (BRKINT))
+        if (new->c_iflag & (IGNBRK | BRKINT))
                 port->read_status_mask |= UART_FIFO_BRKDET_MASK;
 
         port->ignore_status_mask = 0;
diff --git a/drivers/tty/serial/bfin_uart.c b/drivers/tty/serial/bfin_uart.c
index 869ceba2ec57..ac86a20992e9 100644
--- a/drivers/tty/serial/bfin_uart.c
+++ b/drivers/tty/serial/bfin_uart.c
@@ -833,7 +833,7 @@ bfin_serial_set_termios(struct uart_port *port, struct ktermios *termios,
         port->read_status_mask = OE;
         if (termios->c_iflag & INPCK)
                 port->read_status_mask |= (FE | PE);
-        if (termios->c_iflag & (BRKINT | PARMRK))
+        if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK))
                 port->read_status_mask |= BI;
 
         /*
diff --git a/drivers/tty/serial/dz.c b/drivers/tty/serial/dz.c
index 2f2b2e538a54..cdbbc788230a 100644
--- a/drivers/tty/serial/dz.c
+++ b/drivers/tty/serial/dz.c
@@ -625,7 +625,7 @@ static void dz_set_termios(struct uart_port *uport, struct ktermios *termios,
         dport->port.read_status_mask = DZ_OERR;
         if (termios->c_iflag & INPCK)
                 dport->port.read_status_mask |= DZ_FERR | DZ_PERR;
-        if (termios->c_iflag & (BRKINT | PARMRK))
+        if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK))
                 dport->port.read_status_mask |= DZ_BREAK;
 
         /* characters to ignore */
diff --git a/drivers/tty/serial/earlycon.c b/drivers/tty/serial/earlycon.c
index 5131b5ee6164..a514ee6f5406 100644
--- a/drivers/tty/serial/earlycon.c
+++ b/drivers/tty/serial/earlycon.c
@@ -25,7 +25,7 @@
 #include <asm/serial.h>
 
 static struct console early_con = {
-        .name =         "earlycon",
+        .name =         "uart", /* 8250 console switch requires this name */
         .flags =        CON_PRINTBUFFER | CON_BOOT,
         .index =        -1,
 };
diff --git a/drivers/tty/serial/efm32-uart.c b/drivers/tty/serial/efm32-uart.c
index b373f6416e8c..3b0ee9afd76f 100644
--- a/drivers/tty/serial/efm32-uart.c
+++ b/drivers/tty/serial/efm32-uart.c
@@ -407,7 +407,7 @@ static void efm32_uart_set_termios(struct uart_port *port,
         if (new->c_iflag & INPCK)
                 port->read_status_mask |=
                         UARTn_RXDATAX_FERR | UARTn_RXDATAX_PERR;
-        if (new->c_iflag & (BRKINT | PARMRK))
+        if (new->c_iflag & (IGNBRK | BRKINT | PARMRK))
                 port->read_status_mask |= SW_UARTn_RXDATAX_BERR;
 
         port->ignore_status_mask = 0;
diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c
index c5eb897de9de..49385c86cfba 100644
--- a/drivers/tty/serial/fsl_lpuart.c
+++ b/drivers/tty/serial/fsl_lpuart.c
@@ -902,7 +902,7 @@ lpuart_set_termios(struct uart_port *port, struct ktermios *termios,
         sport->port.read_status_mask = 0;
         if (termios->c_iflag & INPCK)
                 sport->port.read_status_mask |= (UARTSR1_FE | UARTSR1_PE);
-        if (termios->c_iflag & (BRKINT | PARMRK))
+        if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK))
                 sport->port.read_status_mask |= UARTSR1_FE;
 
         /* characters to ignore */
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index e2f93874989b..044e86d528ae 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -567,6 +567,9 @@ static void imx_start_tx(struct uart_port *port)
         struct imx_port *sport = (struct imx_port *)port;
         unsigned long temp;
 
+        if (uart_circ_empty(&port->state->xmit))
+                return;
+
         if (USE_IRDA(sport)) {
                 /* half duplex in IrDA mode; have to disable receive mode */
                 temp = readl(sport->port.membase + UCR4);
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;
diff --git a/drivers/tty/serial/m32r_sio.c b/drivers/tty/serial/m32r_sio.c
index 9cd9b4eba9fc..5702828fb62e 100644
--- a/drivers/tty/serial/m32r_sio.c
+++ b/drivers/tty/serial/m32r_sio.c
@@ -266,9 +266,11 @@ static void m32r_sio_start_tx(struct uart_port *port)
         if (!(up->ier & UART_IER_THRI)) {
                 up->ier |= UART_IER_THRI;
                 serial_out(up, UART_IER, up->ier);
-                serial_out(up, UART_TX, xmit->buf[xmit->tail]);
-                xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
-                up->port.icount.tx++;
+                if (!uart_circ_empty(xmit)) {
+                        serial_out(up, UART_TX, xmit->buf[xmit->tail]);
+                        xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
+                        up->port.icount.tx++;
+                }
         }
         while((serial_in(up, UART_LSR) & UART_EMPTY) != UART_EMPTY);
 #else
@@ -737,7 +739,7 @@ static void m32r_sio_set_termios(struct uart_port *port,
         up->port.read_status_mask = UART_LSR_OE | UART_LSR_THRE | UART_LSR_DR;
         if (termios->c_iflag & INPCK)
                 up->port.read_status_mask |= UART_LSR_FE | UART_LSR_PE;
-        if (termios->c_iflag & (BRKINT | PARMRK))
+        if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK))
                 up->port.read_status_mask |= UART_LSR_BI;
 
         /*
diff --git a/drivers/tty/serial/max310x.c b/drivers/tty/serial/max310x.c
index 2a99d0c61b9e..ba285cd45b59 100644
--- a/drivers/tty/serial/max310x.c
+++ b/drivers/tty/serial/max310x.c
@@ -835,7 +835,7 @@ static void max310x_set_termios(struct uart_port *port,
         if (termios->c_iflag & INPCK)
                 port->read_status_mask |= MAX310X_LSR_RXPAR_BIT |
                                           MAX310X_LSR_FRERR_BIT;
-        if (termios->c_iflag & (BRKINT | PARMRK))
+        if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK))
                 port->read_status_mask |= MAX310X_LSR_RXBRK_BIT;
 
         /* Set status ignore mask */
diff --git a/drivers/tty/serial/mcf.c b/drivers/tty/serial/mcf.c
index 0edfaf8cd269..a6f085717f94 100644
--- a/drivers/tty/serial/mcf.c
+++ b/drivers/tty/serial/mcf.c
@@ -248,6 +248,12 @@ static void mcf_set_termios(struct uart_port *port, struct ktermios *termios,
                 mr1 |= MCFUART_MR1_PARITYNONE;
         }
 
+        /*
+         * FIXME: port->read_status_mask and port->ignore_status_mask
+         * need to be initialized based on termios settings for
+         * INPCK, IGNBRK, IGNPAR, PARMRK, BRKINT
+         */
+
         if (termios->c_cflag & CSTOPB)
                 mr2 |= MCFUART_MR2_STOP2;
         else
diff --git a/drivers/tty/serial/mfd.c b/drivers/tty/serial/mfd.c
index 52c930fac210..445799dc9846 100644
--- a/drivers/tty/serial/mfd.c
+++ b/drivers/tty/serial/mfd.c
@@ -977,7 +977,7 @@ serial_hsu_set_termios(struct uart_port *port, struct ktermios *termios,
         up->port.read_status_mask = UART_LSR_OE | UART_LSR_THRE | UART_LSR_DR;
         if (termios->c_iflag & INPCK)
                 up->port.read_status_mask |= UART_LSR_FE | UART_LSR_PE;
-        if (termios->c_iflag & (BRKINT | PARMRK))
+        if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK))
                 up->port.read_status_mask |= UART_LSR_BI;
 
         /* Characters to ignore */
diff --git a/drivers/tty/serial/mpsc.c b/drivers/tty/serial/mpsc.c
index e30a3ca3cea3..759c6a6fa74a 100644
--- a/drivers/tty/serial/mpsc.c
+++ b/drivers/tty/serial/mpsc.c
@@ -1458,7 +1458,7 @@ static void mpsc_set_termios(struct uart_port *port, struct ktermios *termios,
                 pi->port.read_status_mask |= SDMA_DESC_CMDSTAT_PE
                         | SDMA_DESC_CMDSTAT_FR;
 
-        if (termios->c_iflag & (BRKINT | PARMRK))
+        if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK))
                 pi->port.read_status_mask |= SDMA_DESC_CMDSTAT_BR;
 
         /* Characters/events to ignore */
diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
index 778e376f197e..72000a6d5af0 100644
--- a/drivers/tty/serial/msm_serial.c
+++ b/drivers/tty/serial/msm_serial.c
@@ -582,7 +582,7 @@ static void msm_set_termios(struct uart_port *port, struct ktermios *termios,
         port->read_status_mask = 0;
         if (termios->c_iflag & INPCK)
                 port->read_status_mask |= UART_SR_PAR_FRAME_ERR;
-        if (termios->c_iflag & (BRKINT | PARMRK))
+        if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK))
                 port->read_status_mask |= UART_SR_RX_BREAK;
 
         uart_update_timeout(port, termios->c_cflag, baud);
@@ -991,7 +991,7 @@ static const struct of_device_id msm_uartdm_table[] = {
         { }
 };
 
-static int __init msm_serial_probe(struct platform_device *pdev)
+static int msm_serial_probe(struct platform_device *pdev)
 {
         struct msm_port *msm_port;
         struct resource *resource;
diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c
index 4b5b3c2fe328..86de4477d98a 100644
--- a/drivers/tty/serial/mxs-auart.c
+++ b/drivers/tty/serial/mxs-auart.c
@@ -604,7 +604,7 @@ static void mxs_auart_settermios(struct uart_port *u,
 
         if (termios->c_iflag & INPCK)
                 u->read_status_mask |= AUART_STAT_PERR;
-        if (termios->c_iflag & (BRKINT | PARMRK))
+        if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK))
                 u->read_status_mask |= AUART_STAT_BERR;
 
         /*
diff --git a/drivers/tty/serial/netx-serial.c b/drivers/tty/serial/netx-serial.c
index 0a4dd70d29eb..7a6745601d4e 100644
--- a/drivers/tty/serial/netx-serial.c
+++ b/drivers/tty/serial/netx-serial.c
@@ -419,7 +419,7 @@ netx_set_termios(struct uart_port *port, struct ktermios *termios,
         }
 
         port->read_status_mask = 0;
-        if (termios->c_iflag & (BRKINT | PARMRK))
+        if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK))
                 port->read_status_mask |= SR_BE;
         if (termios->c_iflag & INPCK)
                 port->read_status_mask |= SR_PE | SR_FE;
diff --git a/drivers/tty/serial/pmac_zilog.c b/drivers/tty/serial/pmac_zilog.c
index e9d420ff3931..f7ad5b903055 100644
--- a/drivers/tty/serial/pmac_zilog.c
+++ b/drivers/tty/serial/pmac_zilog.c
@@ -653,6 +653,8 @@ static void pmz_start_tx(struct uart_port *port)
         } else {
                 struct circ_buf *xmit = &port->state->xmit;
 
+                if (uart_circ_empty(xmit))
+                        goto out;
                 write_zsdata(uap, xmit->buf[xmit->tail]);
                 zssync(uap);
                 xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
@@ -661,6 +663,7 @@ static void pmz_start_tx(struct uart_port *port)
                 if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
                         uart_write_wakeup(&uap->port);
         }
+ out:
         pmz_debug("pmz: start_tx() done.\n");
 }
 
@@ -1092,7 +1095,7 @@ static void pmz_convert_to_zs(struct uart_pmac_port *uap, unsigned int cflag,
         uap->port.read_status_mask = Rx_OVR;
         if (iflag & INPCK)
                 uap->port.read_status_mask |= CRC_ERR | PAR_ERR;
-        if (iflag & (BRKINT | PARMRK))
+        if (iflag & (IGNBRK | BRKINT | PARMRK))
                 uap->port.read_status_mask |= BRK_ABRT;
 
         uap->port.ignore_status_mask = 0;
diff --git a/drivers/tty/serial/pnx8xxx_uart.c b/drivers/tty/serial/pnx8xxx_uart.c
index de6c05c63683..2ba24a45c97f 100644
--- a/drivers/tty/serial/pnx8xxx_uart.c
+++ b/drivers/tty/serial/pnx8xxx_uart.c
@@ -477,7 +477,7 @@ pnx8xxx_set_termios(struct uart_port *port, struct ktermios *termios,
                 sport->port.read_status_mask |=
                         FIFO_TO_SM(PNX8XXX_UART_FIFO_RXFE) |
                         FIFO_TO_SM(PNX8XXX_UART_FIFO_RXPAR);
-        if (termios->c_iflag & (BRKINT | PARMRK))
+        if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK))
                 sport->port.read_status_mask |=
                         ISTAT_TO_SM(PNX8XXX_UART_INT_BREAK);
 
diff --git a/drivers/tty/serial/pxa.c b/drivers/tty/serial/pxa.c
index 9e7ee39f8b2a..c638c53cd2b6 100644
--- a/drivers/tty/serial/pxa.c
+++ b/drivers/tty/serial/pxa.c
@@ -492,7 +492,7 @@ serial_pxa_set_termios(struct uart_port *port, struct ktermios *termios,
         up->port.read_status_mask = UART_LSR_OE | UART_LSR_THRE | UART_LSR_DR;
         if (termios->c_iflag & INPCK)
                 up->port.read_status_mask |= UART_LSR_FE | UART_LSR_PE;
-        if (termios->c_iflag & (BRKINT | PARMRK))
+        if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK))
                 up->port.read_status_mask |= UART_LSR_BI;
 
         /*
diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
index 329337711bb0..c1d3ebdf3b97 100644
--- a/drivers/tty/serial/samsung.c
+++ b/drivers/tty/serial/samsung.c
@@ -66,7 +66,7 @@ static void dbg(const char *fmt, ...)
         char buff[256];
 
         va_start(va, fmt);
-        vscnprintf(buff, sizeof(buf), fmt, va);
+        vscnprintf(buff, sizeof(buff), fmt, va);
         va_end(va);
 
         printascii(buff);
diff --git a/drivers/tty/serial/sb1250-duart.c b/drivers/tty/serial/sb1250-duart.c
index a7cdec2962dd..771f361c47ea 100644
--- a/drivers/tty/serial/sb1250-duart.c
+++ b/drivers/tty/serial/sb1250-duart.c
@@ -596,7 +596,7 @@ static void sbd_set_termios(struct uart_port *uport, struct ktermios *termios,
         if (termios->c_iflag & INPCK)
                 uport->read_status_mask |= M_DUART_FRM_ERR |
                                            M_DUART_PARITY_ERR;
-        if (termios->c_iflag & (BRKINT | PARMRK))
+        if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK))
                 uport->read_status_mask |= M_DUART_RCVD_BRK;
 
         uport->ignore_status_mask = 0;
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,
         port->read_status_mask = SR_OVR;
         if (termios->c_iflag & INPCK)
                 port->read_status_mask |= SR_PE | SR_FE;
-        if (termios->c_iflag & (BRKINT | PARMRK))
+        if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK))
                 port->read_status_mask |= SR_BRK;
 
         /* Set status ignore mask */
diff --git a/drivers/tty/serial/serial_ks8695.c b/drivers/tty/serial/serial_ks8695.c
index e1caa99e3d3b..5c79bdab985d 100644
--- a/drivers/tty/serial/serial_ks8695.c
+++ b/drivers/tty/serial/serial_ks8695.c
@@ -437,7 +437,7 @@ static void ks8695uart_set_termios(struct uart_port *port, struct ktermios *term
         port->read_status_mask = URLS_URROE;
         if (termios->c_iflag & INPCK)
                 port->read_status_mask |= (URLS_URFE | URLS_URPE);
-        if (termios->c_iflag & (BRKINT | PARMRK))
+        if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK))
                 port->read_status_mask |= URLS_URBI;
 
         /*
diff --git a/drivers/tty/serial/serial_txx9.c b/drivers/tty/serial/serial_txx9.c
index 60f49b9d7e39..ea8546092c7e 100644
--- a/drivers/tty/serial/serial_txx9.c
+++ b/drivers/tty/serial/serial_txx9.c
@@ -697,7 +697,7 @@ serial_txx9_set_termios(struct uart_port *port, struct ktermios *termios,
                 TXX9_SIDISR_TDIS | TXX9_SIDISR_RDIS;
         if (termios->c_iflag & INPCK)
                 up->port.read_status_mask |= TXX9_SIDISR_UFER | TXX9_SIDISR_UPER;
-        if (termios->c_iflag & (BRKINT | PARMRK))
+        if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK))
                 up->port.read_status_mask |= TXX9_SIDISR_UBRK;
 
         /*
diff --git a/drivers/tty/serial/sirfsoc_uart.c b/drivers/tty/serial/sirfsoc_uart.c
index 1f2be48c92ce..9b4d71cff00d 100644
--- a/drivers/tty/serial/sirfsoc_uart.c
+++ b/drivers/tty/serial/sirfsoc_uart.c
@@ -896,7 +896,7 @@ static void sirfsoc_uart_set_termios(struct uart_port *port,
                 if (termios->c_iflag & INPCK)
                         port->read_status_mask |= uint_en->sirfsoc_frm_err_en;
         }
-        if (termios->c_iflag & (BRKINT | PARMRK))
+        if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK))
                         port->read_status_mask |= uint_en->sirfsoc_rxd_brk_en;
         if (sirfport->uart_reg->uart_type == SIRF_REAL_UART) {
                 if (termios->c_iflag & IGNPAR)
diff --git a/drivers/tty/serial/st-asc.c b/drivers/tty/serial/st-asc.c
index c7f61ac27132..f48b1cc07eea 100644
--- a/drivers/tty/serial/st-asc.c
+++ b/drivers/tty/serial/st-asc.c
@@ -547,7 +547,7 @@ static void asc_set_termios(struct uart_port *port, struct ktermios *termios,
         ascport->port.read_status_mask = ASC_RXBUF_DUMMY_OE;
         if (termios->c_iflag & INPCK)
                 ascport->port.read_status_mask |= ASC_RXBUF_FE | ASC_RXBUF_PE;
-        if (termios->c_iflag & (BRKINT | PARMRK))
+        if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK))
                 ascport->port.read_status_mask |= ASC_RXBUF_DUMMY_BE;
 
         /*
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);
 
         /*
diff --git a/drivers/tty/serial/sunsu.c b/drivers/tty/serial/sunsu.c
index 9a0f24f83720..5326ae195e5f 100644
--- a/drivers/tty/serial/sunsu.c
+++ b/drivers/tty/serial/sunsu.c
@@ -834,7 +834,7 @@ sunsu_change_speed(struct uart_port *port, unsigned int cflag,
         up->port.read_status_mask = UART_LSR_OE | UART_LSR_THRE | UART_LSR_DR;
         if (iflag & INPCK)
                 up->port.read_status_mask |= UART_LSR_FE | UART_LSR_PE;
-        if (iflag & (BRKINT | PARMRK))
+        if (iflag & (IGNBRK | BRKINT | PARMRK))
                 up->port.read_status_mask |= UART_LSR_BI;
 
         /*
diff --git a/drivers/tty/serial/sunzilog.c b/drivers/tty/serial/sunzilog.c
index a2c40ed287d2..02df3940b95e 100644
--- a/drivers/tty/serial/sunzilog.c
+++ b/drivers/tty/serial/sunzilog.c
@@ -703,6 +703,8 @@ static void sunzilog_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);
@@ -915,7 +917,7 @@ sunzilog_convert_to_zs(struct uart_sunzilog_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;
diff --git a/drivers/tty/serial/ucc_uart.c b/drivers/tty/serial/ucc_uart.c
index d569ca58bab6..1c52074c38df 100644
--- a/drivers/tty/serial/ucc_uart.c
+++ b/drivers/tty/serial/ucc_uart.c
@@ -936,7 +936,7 @@ static void qe_uart_set_termios(struct uart_port *port,
         port->read_status_mask = BD_SC_EMPTY | BD_SC_OV;
         if (termios->c_iflag & INPCK)
                 port->read_status_mask |= BD_SC_FR | BD_SC_PR;
-        if (termios->c_iflag & (BRKINT | PARMRK))
+        if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK))
                 port->read_status_mask |= BD_SC_BR;
 
         /*
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;
diff --git a/drivers/tty/serial/zs.c b/drivers/tty/serial/zs.c
index 6a169877109b..2b65bb7ffb8a 100644
--- a/drivers/tty/serial/zs.c
+++ b/drivers/tty/serial/zs.c
@@ -923,7 +923,7 @@ static void zs_set_termios(struct uart_port *uport, struct ktermios *termios,
         uport->read_status_mask = Rx_OVR;
         if (termios->c_iflag & INPCK)
                 uport->read_status_mask |= FRM_ERR | PAR_ERR;
-        if (termios->c_iflag & (BRKINT | PARMRK))
+        if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK))
                 uport->read_status_mask |= Rx_BRK;
 
         uport->ignore_status_mask = 0;