]> err.no Git - linux-2.6/commitdiff
port_fixups: Fix ups for tty port changes
authorAlan Cox <alan@redhat.com>
Tue, 22 Jul 2008 14:25:07 +0000 (15:25 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Jul 2008 20:03:29 +0000 (13:03 -0700)
I missed the cpm_uart one. Thanks to Kumar Gala for reporting it. A double
check found samsung also needed fixing up.

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/serial/cpm_uart/cpm_uart_core.c
drivers/serial/samsung.c

index abe129cc927ad857c70a4259934a8c734414bedc..93e407ee08b91a97614103cb9520c307c4c7fd53 100644 (file)
@@ -209,7 +209,7 @@ static void cpm_uart_int_rx(struct uart_port *port)
        int i;
        unsigned char ch;
        u8 *cp;
-       struct tty_struct *tty = port->info->tty;
+       struct tty_struct *tty = port->info->port.tty;
        struct uart_cpm_port *pinfo = (struct uart_cpm_port *)port;
        cbd_t __iomem *bdp;
        u16 status;
index 4a3ecaa629e6c90773c420a3a3a7d599fe10978d..d852f83f890046b2cdc07b856c05173615873934 100644 (file)
@@ -202,7 +202,7 @@ s3c24xx_serial_rx_chars(int irq, void *dev_id)
 {
        struct s3c24xx_uart_port *ourport = dev_id;
        struct uart_port *port = &ourport->port;
-       struct tty_struct *tty = port->info->tty;
+       struct tty_struct *tty = port->info->port.tty;
        unsigned int ufcon, ch, flag, ufstat, uerstat;
        int max_count = 64;