diff options
Diffstat (limited to 'drivers/serial')
-rw-r--r-- | drivers/serial/atmel_serial.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c index bb9c3574caa9..4d1ccc2b762d 100644 --- a/drivers/serial/atmel_serial.c +++ b/drivers/serial/atmel_serial.c | |||
@@ -615,7 +615,7 @@ static void atmel_set_termios(struct uart_port *port, struct ktermios *termios, | |||
615 | imr = UART_GET_IMR(port); | 615 | imr = UART_GET_IMR(port); |
616 | UART_PUT_IDR(port, -1); | 616 | UART_PUT_IDR(port, -1); |
617 | while (!(UART_GET_CSR(port) & ATMEL_US_TXEMPTY)) | 617 | while (!(UART_GET_CSR(port) & ATMEL_US_TXEMPTY)) |
618 | barrier(); | 618 | cpu_relax(); |
619 | 619 | ||
620 | /* disable receiver and transmitter */ | 620 | /* disable receiver and transmitter */ |
621 | UART_PUT_CR(port, ATMEL_US_TXDIS | ATMEL_US_RXDIS); | 621 | UART_PUT_CR(port, ATMEL_US_TXDIS | ATMEL_US_RXDIS); |
@@ -794,7 +794,7 @@ void __init atmel_register_uart_fns(struct atmel_port_fns *fns) | |||
794 | static void atmel_console_putchar(struct uart_port *port, int ch) | 794 | static void atmel_console_putchar(struct uart_port *port, int ch) |
795 | { | 795 | { |
796 | while (!(UART_GET_CSR(port) & ATMEL_US_TXRDY)) | 796 | while (!(UART_GET_CSR(port) & ATMEL_US_TXRDY)) |
797 | barrier(); | 797 | cpu_relax(); |
798 | UART_PUT_CHAR(port, ch); | 798 | UART_PUT_CHAR(port, ch); |
799 | } | 799 | } |
800 | 800 | ||