From 193da81093cfc0f8ad7829c848f9620fd0dacecf Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Tue, 29 May 2007 21:53:50 +0100 Subject: [PATCH] --- yaml --- r: 57125 b: refs/heads/master c: 2389b272168ceec056ca1d8a870a97fa9c26e11a h: refs/heads/master i: 57123: 36bac1862a9991f07983aad456ef878ad705e1d0 v: v3 --- [refs] | 2 +- trunk/drivers/serial/amba-pl010.c | 3 ++- trunk/drivers/serial/amba-pl011.c | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a60e4412dba7..337170ae8b48 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2ccdd1e77da52ad494e9af46bf272d816830cb28 +refs/heads/master: 2389b272168ceec056ca1d8a870a97fa9c26e11a diff --git a/trunk/drivers/serial/amba-pl010.c b/trunk/drivers/serial/amba-pl010.c index 1a9a24b82636..00d1255e4c12 100644 --- a/trunk/drivers/serial/amba-pl010.c +++ b/trunk/drivers/serial/amba-pl010.c @@ -167,8 +167,9 @@ static void pl010_rx_chars(struct uart_amba_port *uap) ignore_char: status = readb(uap->port.membase + UART01x_FR); } + spin_unlock(&port->lock); tty_flip_buffer_push(tty); - return; + spin_lock(&port->lock); } static void pl010_tx_chars(struct uart_amba_port *uap) diff --git a/trunk/drivers/serial/amba-pl011.c b/trunk/drivers/serial/amba-pl011.c index 44639e71372a..954073c6ce3a 100644 --- a/trunk/drivers/serial/amba-pl011.c +++ b/trunk/drivers/serial/amba-pl011.c @@ -153,8 +153,9 @@ static void pl011_rx_chars(struct uart_amba_port *uap) ignore_char: status = readw(uap->port.membase + UART01x_FR); } + spin_unlock(&uap->port.lock); tty_flip_buffer_push(tty); - return; + spin_lock(&uap->port.lock); } static void pl011_tx_chars(struct uart_amba_port *uap)