@@ -826,7 +826,7 @@ static void atmel_release_rx_dma(struct uart_port *port)
atmel_port->chan_rx = NULL;
atmel_port->cookie_rx = -EINVAL;
- if (port->line == 0)
+ if (!atmel_port->is_usart)
del_timer_sync(&atmel_port->uart_timer);
}
@@ -1230,7 +1230,7 @@ static void atmel_release_rx_pdc(struct uart_port *port)
kfree(pdc->buf);
}
- if (port->line == 0)
+ if (!atmel_port->is_usart)
del_timer_sync(&atmel_port->uart_timer);
}
@@ -1593,7 +1593,7 @@ static int atmel_startup(struct uart_port *port)
if (atmel_use_pdc_rx(port)) {
/* set UART timeout */
- if (port->line == 0) {
+ if (!atmel_port->is_usart) {
setup_timer(&atmel_port->uart_timer,
atmel_uart_timer_callback,
(unsigned long)port);
@@ -1610,7 +1610,7 @@ static int atmel_startup(struct uart_port *port)
UART_PUT_PTCR(port, ATMEL_PDC_RXTEN);
} else if (atmel_use_dma_rx(port)) {
/* set UART timeout */
- if (port->line == 0) {
+ if (!atmel_port->is_usart) {
setup_timer(&atmel_port->uart_timer,
atmel_uart_timer_callback,
(unsigned long)port);
Signed-off-by: Elen Song <elen.song@atmel.com> --- drivers/tty/serial/atmel_serial.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)