mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
tty/serial: atmel: fix TX path in atmel_console_write()
A side effect of89d8232411("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 <[email protected]> Fixes:89d8232411("tty/serial: atmel_serial: BUG: stop DMA from transmitting in stop_tx") Cc: stable <[email protected]> #4.4+ Acked-by: Richard Genoud <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
parent
31ca2c63fd
commit
497e1e16f4
1 changed files with 3 additions and 0 deletions
|
|
@ -2488,6 +2488,9 @@ static void atmel_console_write(struct console *co, const char *s, u_int count)
|
|||
pdc_tx = atmel_uart_readl(port, ATMEL_PDC_PTSR) & ATMEL_PDC_TXTEN;
|
||||
atmel_uart_writel(port, ATMEL_PDC_PTCR, ATMEL_PDC_TXTDIS);
|
||||
|
||||
/* Make sure that tx path is actually able to send characters */
|
||||
atmel_uart_writel(port, ATMEL_US_CR, ATMEL_US_TXEN);
|
||||
|
||||
uart_console_write(port, s, count, atmel_console_putchar);
|
||||
|
||||
/*
|
||||
|
|
|
|||
Loading…
Reference in a new issue