---

yaml --- r: 38168 b: refs/heads/master c: 9e84b60 h: refs/heads/master v: v3
git-mirror · Sep 26, 2006 · f139223 · f139223
1 parent edb164d
commit f139223
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c32527a14049130eb29103b8da27520f07092371
+refs/heads/master: 9e84b60ed87f5fe2dce10be2db1bfbb926a49e66
diff --git a/trunk/drivers/serial/8250.c b/trunk/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) {
-			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);