diff options
| author | Russell King | 2007-06-05 20:39:49 +0200 |
|---|---|---|
| committer | Russell King | 2007-06-05 20:39:49 +0200 |
| commit | db002b8597df84643e949cce793d0f696f100c9e (patch) | |
| tree | ca5bd9be57defe721f8cf7a64106b0990bb3fecb | |
| parent | [ARM] 4421/1: AT91: Value of _KEY fields. (diff) | |
| download | kernel-qcow2-linux-db002b8597df84643e949cce793d0f696f100c9e.tar.gz kernel-qcow2-linux-db002b8597df84643e949cce793d0f696f100c9e.tar.xz kernel-qcow2-linux-db002b8597df84643e949cce793d0f696f100c9e.zip | |
[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>
| -rw-r--r-- | drivers/serial/amba-pl010.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/amba-pl010.c b/drivers/serial/amba-pl010.c index 00d1255e4c12..e88da72f8304 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) |