2 files changed, 3 insertions, 3 deletions

diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index 0ae9ced00ed4..10c2daab99ac 100644
--- 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) {
-                        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);
 
diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c
index 392bffcf96e8..95738a19cde7 100644
--- a/drivers/serial/s3c2410.c
+++ b/drivers/serial/s3c2410.c
@@ -1621,7 +1621,7 @@ static struct s3c24xx_uart_info s3c2412_uart_inf = {
 static int s3c2412_serial_probe(struct platform_device *dev)
 {
         dbg("s3c2440_serial_probe: dev=%p\n", dev);
-        return s3c24xx_serial_probe(dev, &s3c2440_uart_inf);
+        return s3c24xx_serial_probe(dev, &s3c2412_uart_inf);
 }
 
 static struct platform_driver s3c2412_serial_drv = {