Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
[sfrench/cifs-2.6.git] / drivers / tty / serial / ucc_uart.c
index afc2a5d69202c118799f4c607e90f1ae6e0b0832..3c8c662c69e2509a12f2f3bbb666522335d42807 100644 (file)
@@ -336,8 +336,6 @@ static int qe_uart_tx_pump(struct uart_qe_port *qe_port)
        struct uart_port *port = &qe_port->port;
        struct circ_buf *xmit = &port->state->xmit;
 
-       bdp = qe_port->rx_cur;
-
        /* Handle xon/xoff */
        if (port->x_char) {
                /* Pick next descriptor and fill from buffer */
@@ -556,9 +554,7 @@ handle_error:
        /* Overrun does not affect the current character ! */
        if (status & BD_SC_OV)
                tty_insert_flip_char(tport, 0, TTY_OVERRUN);
-#ifdef SUPPORT_SYSRQ
        port->sysrq = 0;
-#endif
        goto error_return;
 }