Merge 3.8-rc5 into tty-next

[deliverable/linux.git] / drivers / tty / serial / mxs-auart.c

diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c
index e55615eb34ad32037cf78dc18aef63a00373e1ee..d549fe1fa42abdce8611645d1038dfb11b5e0654 100644 (file)
--- a/drivers/tty/serial/mxs-auart.c
+++ b/drivers/tty/serial/mxs-auart.c
@@ -364,7 +364,6 @@ out:
 
 static void mxs_auart_rx_chars(struct mxs_auart_port *s)
 {
-       struct tty_struct *tty = s->port.state->port.tty;
        u32 stat = 0;
 
        for (;;) {
@@ -375,7 +374,7 @@ static void mxs_auart_rx_chars(struct mxs_auart_port *s)
        }
 
        writel(stat, s->port.membase + AUART_STAT);
-       tty_flip_buffer_push(tty);
+       tty_flip_buffer_push(&s->port.state->port);
 }
 
 static int mxs_auart_request_port(struct uart_port *u)
@@ -459,7 +458,7 @@ static int mxs_auart_dma_prep_rx(struct mxs_auart_port *s);
 static void dma_rx_callback(void *arg)
 {
        struct mxs_auart_port *s = (struct mxs_auart_port *) arg;
-       struct tty_struct *tty = s->port.state->port.tty;
+       struct tty_port *port = &s->port.state->port;
        int count;
        u32 stat;
 
@@ -470,10 +469,10 @@ static void dma_rx_callback(void *arg)
                        AUART_STAT_PERR | AUART_STAT_FERR);
 
        count = stat & AUART_STAT_RXCOUNT_MASK;
-       tty_insert_flip_string(tty, s->rx_dma_buf, count);
+       tty_insert_flip_string(port, s->rx_dma_buf, count);
 
        writel(stat, s->port.membase + AUART_STAT);
-       tty_flip_buffer_push(tty);
+       tty_flip_buffer_push(port);
 
        /* start the next DMA for RX. */
        mxs_auart_dma_prep_rx(s);
@@ -552,7 +551,7 @@ static int mxs_auart_dma_init(struct mxs_auart_port *s)
                return 0;
 
        /* We do not get the right DMA channels. */
-       if (s->dma_channel_rx == -1 || s->dma_channel_rx == -1)
+       if (s->dma_channel_rx == -1 || s->dma_channel_tx == -1)
                return -EINVAL;
 
        /* init for RX */