Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux...

[~andy/linux] / drivers / tty / serial / lpc32xx_hs.c

diff --git a/drivers/tty/serial/lpc32xx_hs.c b/drivers/tty/serial/lpc32xx_hs.c
index 8fdf6a8fc07429fbcc7afd9d8f362eec28ee9150..701644f06820db0a9dbe052d560a0d1bf3f342be 100644 (file)
--- a/drivers/tty/serial/lpc32xx_hs.c
+++ b/drivers/tty/serial/lpc32xx_hs.c
@@ -279,7 +279,10 @@ static void __serial_lpc32xx_rx(struct uart_port *port)
 
                tmp = readl(LPC32XX_HSUART_FIFO(port->membase));
        }
+
+       spin_unlock(&port->lock);
        tty_flip_buffer_push(tport);
+       spin_lock(&port->lock);
 }
 
 static void __serial_lpc32xx_tx(struct uart_port *port)