Skip to content

Commit 0a1757c

Browse files
noglitchgregkh
authored andcommitted
tty/serial: atmel: fix TX path in atmel_console_write()
commit 497e1e16f45c70574dc9922c7f75c642c2162119 upstream. A side effect of 89d8232411a8 ("tty/serial: atmel_serial: BUG: stop DMA from transmitting in stop_tx") is that the console can be called with TX path disabled. Then the system would hang trying to push charecters out in atmel_console_putchar(). Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com> Fixes: 89d8232411a8 ("tty/serial: atmel_serial: BUG: stop DMA from transmitting in stop_tx") Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 74b8fc0 commit 0a1757c

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

drivers/tty/serial/atmel_serial.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2504,6 +2504,9 @@ static void atmel_console_write(struct console *co, const char *s, u_int count)
25042504
pdc_tx = atmel_uart_readl(port, ATMEL_PDC_PTSR) & ATMEL_PDC_TXTEN;
25052505
atmel_uart_writel(port, ATMEL_PDC_PTCR, ATMEL_PDC_TXTDIS);
25062506

2507+
/* Make sure that tx path is actually able to send characters */
2508+
atmel_uart_writel(port, ATMEL_US_CR, ATMEL_US_TXEN);
2509+
25072510
uart_console_write(port, s, count, atmel_console_putchar);
25082511

25092512
/*

0 commit comments

Comments
 (0)