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

2389b27216 contains a merge bug; fix it.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King 2007-06-05 19:39:49 +01:00 committed by Russell King
parent 0e5f82dda5
commit db002b8597

View file

@ -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)