OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0e5f82d
)
[ARM] Fix 4417/1: Serial: Fix AMBA drivers locking
author
Russell King
<rmk@dyn-67.arm.linux.org.uk>
Tue, 5 Jun 2007 18:39:49 +0000
(19:39 +0100)
committer
Russell King
<rmk+kernel@arm.linux.org.uk>
Tue, 5 Jun 2007 18:39:49 +0000
(19:39 +0100)
2389b272168ceec056ca1d8a870a97fa9c26e11a
contains a merge bug; fix it.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
drivers/serial/amba-pl010.c
patch
|
blob
|
history
diff --git
a/drivers/serial/amba-pl010.c
b/drivers/serial/amba-pl010.c
index
00d1255
..
e88da72
100644
(file)
--- 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)