Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[pandora-kernel.git] / drivers / serial / ip22zilog.c

diff --git a/drivers/serial/ip22zilog.c b/drivers/serial/ip22zilog.c
index 9c95bc0..0d9acbd 100644 (file)
--- a/drivers/serial/ip22zilog.c
+++ b/drivers/serial/ip22zilog.c
@@ -257,8 +257,8 @@ static struct tty_struct *ip22zilog_receive_chars(struct uart_ip22zilog_port *up
 
        tty = NULL;
        if (up->port.info != NULL &&
-           up->port.info->tty != NULL)
-               tty = up->port.info->tty;
+           up->port.info->port.tty != NULL)
+               tty = up->port.info->port.tty;
 
        for (;;) {
                ch = readb(&channel->control);