diff options
Diffstat (limited to 'drivers/tty/serial/atmel_serial.c')
-rw-r--r-- | drivers/tty/serial/atmel_serial.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c index a507daa05cfb..bb723542ad24 100644 --- a/drivers/tty/serial/atmel_serial.c +++ b/drivers/tty/serial/atmel_serial.c | |||
@@ -1433,10 +1433,10 @@ static void __devinit atmel_init_port(struct atmel_uart_port *atmel_port, | |||
1433 | 1433 | ||
1434 | memset(&atmel_port->rx_ring, 0, sizeof(atmel_port->rx_ring)); | 1434 | memset(&atmel_port->rx_ring, 0, sizeof(atmel_port->rx_ring)); |
1435 | 1435 | ||
1436 | if (pdata->regs) | 1436 | if (pdata->regs) { |
1437 | /* Already mapped by setup code */ | 1437 | /* Already mapped by setup code */ |
1438 | port->membase = pdata->regs; | 1438 | port->membase = pdata->regs; |
1439 | else { | 1439 | } else { |
1440 | port->flags |= UPF_IOREMAP; | 1440 | port->flags |= UPF_IOREMAP; |
1441 | port->membase = NULL; | 1441 | port->membase = NULL; |
1442 | } | 1442 | } |
@@ -1450,9 +1450,10 @@ static void __devinit atmel_init_port(struct atmel_uart_port *atmel_port, | |||
1450 | /* only enable clock when USART is in use */ | 1450 | /* only enable clock when USART is in use */ |
1451 | } | 1451 | } |
1452 | 1452 | ||
1453 | atmel_port->use_dma_rx = pdata->use_dma_rx; | 1453 | atmel_port->use_dma_rx = pdata->use_dma_rx; |
1454 | atmel_port->use_dma_tx = pdata->use_dma_tx; | 1454 | atmel_port->use_dma_tx = pdata->use_dma_tx; |
1455 | atmel_port->rs485 = pdata->rs485; | 1455 | atmel_port->rs485 = pdata->rs485; |
1456 | |||
1456 | /* Use TXEMPTY for interrupt when rs485 else TXRDY or ENDTX|TXBUFE */ | 1457 | /* Use TXEMPTY for interrupt when rs485 else TXRDY or ENDTX|TXBUFE */ |
1457 | if (atmel_port->rs485.flags & SER_RS485_ENABLED) | 1458 | if (atmel_port->rs485.flags & SER_RS485_ENABLED) |
1458 | atmel_port->tx_done_mask = ATMEL_US_TXEMPTY; | 1459 | atmel_port->tx_done_mask = ATMEL_US_TXEMPTY; |