git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial
[pandora-kernel.git]
/
drivers
/
serial
/
8250.c
diff --git
a/drivers/serial/8250.c
b/drivers/serial/8250.c
index
0ede0ee
..
cc2a205
100644
(file)
--- a/
drivers/serial/8250.c
+++ b/
drivers/serial/8250.c
@@
-320,8
+320,8
@@
static unsigned int serial_in(struct uart_8250_port *up, int offset)
case UPIO_TSI:
if (offset == UART_IIR) {
case UPIO_TSI:
if (offset == UART_IIR) {
- tmp = readl(
(u32 *)(up->port.membase + UART_RX
));
- return (
cpu_to_le32(tmp) >> 8) & 0xff;
+ tmp = readl(
up->port.membase + (UART_IIR & ~3
));
+ return (
tmp >> 16) & 0xff; /* UART_IIR % 4 == 2 */
} else
return readb(up->port.membase + offset);
} else
return readb(up->port.membase + offset);