Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db002b85 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

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



2389b272 contains a merge bug; fix it.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 0e5f82dd

drivers/serial/amba-pl010.c

+2 −2
Original line number Diff line number Diff line
@@ -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)