diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-04-20 13:51:21 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-04-20 13:51:21 +0800 |
| commit | 663276faa26c2837eca83a5800b3668be19aaaff (patch) | |
| tree | aee6a1964c83eb2153bde4a4c442af88204a28a8 /drivers/tty/serial | |
| parent | 667ea3959654ae48ef303df13f2635fd07766cb4 (diff) | |
| parent | 5c43c539346972b9a1d5f38dc62db5a39997488d (diff) | |
Merge tag 'v3.14.39' into linux-linaro-lsk-v3.14
This is the 3.14.39 stable release
Diffstat (limited to 'drivers/tty/serial')
| -rw-r--r-- | drivers/tty/serial/fsl_lpuart.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c index 175f123f4f09..501c465feb59 100644 --- a/drivers/tty/serial/fsl_lpuart.c +++ b/drivers/tty/serial/fsl_lpuart.c @@ -362,6 +362,9 @@ static void lpuart_setup_watermark(struct lpuart_port *sport) writeb(val | UARTPFIFO_TXFE | UARTPFIFO_RXFE, sport->port.membase + UARTPFIFO); + /* explicitly clear RDRF */ + readb(sport->port.membase + UARTSR1); + /* flush Tx and Rx FIFO */ writeb(UARTCFIFO_TXFLUSH | UARTCFIFO_RXFLUSH, sport->port.membase + UARTCFIFO); |