1 files changed, 10 insertions, 4 deletions

diff --git a/drivers/tty/serial/max310x.c b/drivers/tty/serial/max310x.c
index 36943f6c198c..81b2413c3da4 100644
--- a/drivers/tty/serial/max310x.c
+++ b/drivers/tty/serial/max310x.c
@@ -680,10 +680,16 @@ static void max310x_handle_rx(struct uart_port *port, unsigned int rxlen)
                         port->icount.overrun++;
                 }
 
-                for (i = 0; i < rxlen; ++i) {
-                        uart_insert_char(port, sts, MAX310X_LSR_RXOVR_BIT,
-                                         one->rx_buf[i], flag);
-                }
+                for (i = 0; i < (rxlen - 1); ++i)
+                        uart_insert_char(port, sts, 0, one->rx_buf[i], flag);
+
+                /*
+                 * Handle the overrun case for the last character only, since
+                 * the RxFIFO overflow happens after it is pushed to the FIFO
+                 * tail.
+                 */
+                uart_insert_char(port, sts, MAX310X_LSR_RXOVR_BIT,
+                                 one->rx_buf[rxlen], flag);
 
         } else {
                 if (unlikely(rxlen >= port->fifosize)) {