From 52a4ebcb17482f55d9f4e02b5198ca28803c98d8 Mon Sep 17 00:00:00 2001 From: Russell King Date: Tue, 5 Jun 2007 19:39:49 +0100 Subject: [PATCH] --- yaml --- r: 57413 b: refs/heads/master c: db002b8597df84643e949cce793d0f696f100c9e h: refs/heads/master i: 57411: ece978e3ee5df595a8c1a097a390e72a084ec35e v: v3 --- [refs] | 2 +- trunk/drivers/serial/amba-pl010.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7e604d06a690..d27ff0860d20 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0e5f82dda5e60a21cf8ba4f77334d60290277d2c +refs/heads/master: db002b8597df84643e949cce793d0f696f100c9e diff --git a/trunk/drivers/serial/amba-pl010.c b/trunk/drivers/serial/amba-pl010.c index 00d1255e4c12..e88da72f8304 100644 --- a/trunk/drivers/serial/amba-pl010.c +++ b/trunk/drivers/serial/amba-pl010.c @@ -167,9 +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); + spin_unlock(&uap->port.lock); tty_flip_buffer_push(tty); - spin_lock(&port->lock); + spin_lock(&uap->port.lock); } static void pl010_tx_chars(struct uart_amba_port *uap)