From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Tue, 5 Jun 2007 18:39:49 +0000 (+0100)
Subject: [ARM] Fix 4417/1: Serial: Fix AMBA drivers locking
X-Git-Tag: v2.6.22-rc5~97^2~1
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db002b8597df84643e949cce793d0f696f100c9e;p=linux-2.6

[ARM] Fix 4417/1: Serial: Fix AMBA drivers locking

2389b272168ceec056ca1d8a870a97fa9c26e11a contains a merge bug; fix it.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/drivers/serial/amba-pl010.c b/drivers/serial/amba-pl010.c
index 00d1255e4c..e88da72f83 100644
--- a/drivers/serial/amba-pl010.c
+++ b/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)