lib/decompress_bunzip2.c: fix checkstack warning

[karo-tx-linux.git] / drivers / serial / bfin_5xx.c

diff --git a/drivers/serial/bfin_5xx.c b/drivers/serial/bfin_5xx.c
index a78652b21e402afe7a146bbdf2f389e44729fd35..a9eff2b18eab25ed0fb797f3e0a97be8e2b913c0 100644 (file)
--- a/drivers/serial/bfin_5xx.c
+++ b/drivers/serial/bfin_5xx.c
@@ -797,7 +797,7 @@ static void bfin_serial_shutdown(struct uart_port *port)
                gpio_free(uart->rts_pin);
 #endif
 #ifdef CONFIG_SERIAL_BFIN_HARD_CTSRTS
-       if (UART_GET_IER(uart) && EDSSI)
+       if (UART_GET_IER(uart) & EDSSI)
                free_irq(uart->status_irq, uart);
 #endif
 }
@@ -957,15 +957,12 @@ bfin_serial_verify_port(struct uart_port *port, struct serial_struct *ser)
  * Enable the IrDA function if tty->ldisc.num is N_IRDA.
  * In other cases, disable IrDA function.
  */
-static void bfin_serial_set_ldisc(struct uart_port *port)
+static void bfin_serial_set_ldisc(struct uart_port *port, int ld)
 {
        int line = port->line;
        unsigned short val;
 
-       if (line >= port->state->port.tty->driver->num)
-               return;
-
-       switch (port->state->port.tty->termios->c_line) {
+       switch (ld) {
        case N_IRDA:
                val = UART_GET_GCTL(&bfin_serial_ports[line]);
                val |= (IREN | RPOLC);