diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-06-05 19:39:49 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-06-05 19:39:49 +0100 |
| commit | db002b8597df84643e949cce793d0f696f100c9e (patch) | |
| tree | ca5bd9be57defe721f8cf7a64106b0990bb3fecb /drivers/serial | |
| parent | 0e5f82dda5e60a21cf8ba4f77334d60290277d2c (diff) | |
| download | op-kernel-dev-db002b8597df84643e949cce793d0f696f100c9e.zip op-kernel-dev-db002b8597df84643e949cce793d0f696f100c9e.tar.gz | |
[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>
Diffstat (limited to 'drivers/serial')
| -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 00d1255..e88da72 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) |
