From d37ab36c8de02cf592ce067373871f6ea2edf4aa Mon Sep 17 00:00:00 2001 From: Nicolas Ferre Date: Wed, 12 Oct 2011 18:06:58 +0200 Subject: [PATCH] --- yaml --- r: 267359 b: refs/heads/master c: 588edbf3b8948d94a52da5d6b45c9bb7307d1f01 h: refs/heads/master i: 267357: 055b420bdbefc718e358b1da73a227158779d089 267355: b57726501831e5b75ee7319bd0738e8a8533fe5f 267351: 4092c01d0fe99fe9e1f5d57d826ae88db84ae3d0 267343: 996cc22bb885fe0ba857063fed34692efe40a56d 267327: 5dca7733725c5aac7b965f195dbd42f6ec2db580 v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/atmel_serial.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 160ac714a332..8f919cb3c44c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1acfc7eca664783ee20d951683ed229eaa64f573 +refs/heads/master: 588edbf3b8948d94a52da5d6b45c9bb7307d1f01 diff --git a/trunk/drivers/tty/serial/atmel_serial.c b/trunk/drivers/tty/serial/atmel_serial.c index a507daa05cfb..bb723542ad24 100644 --- a/trunk/drivers/tty/serial/atmel_serial.c +++ b/trunk/drivers/tty/serial/atmel_serial.c @@ -1433,10 +1433,10 @@ static void __devinit atmel_init_port(struct atmel_uart_port *atmel_port, memset(&atmel_port->rx_ring, 0, sizeof(atmel_port->rx_ring)); - if (pdata->regs) + if (pdata->regs) { /* Already mapped by setup code */ port->membase = pdata->regs; - else { + } else { port->flags |= UPF_IOREMAP; port->membase = NULL; } @@ -1450,9 +1450,10 @@ static void __devinit atmel_init_port(struct atmel_uart_port *atmel_port, /* only enable clock when USART is in use */ } - atmel_port->use_dma_rx = pdata->use_dma_rx; - atmel_port->use_dma_tx = pdata->use_dma_tx; + atmel_port->use_dma_rx = pdata->use_dma_rx; + atmel_port->use_dma_tx = pdata->use_dma_tx; atmel_port->rs485 = pdata->rs485; + /* Use TXEMPTY for interrupt when rs485 else TXRDY or ENDTX|TXBUFE */ if (atmel_port->rs485.flags & SER_RS485_ENABLED) atmel_port->tx_done_mask = ATMEL_US_TXEMPTY;