ttydev: fix pamc_zilog for tty pointer move

[linux-2.6-omap-h63xx.git] / drivers / serial / sunzilog.c

diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c
index 90a20a152ebfe9ce0779b3ddba4682941ce9de4a..0f3d69b86d6795de97bc81239d20fb78cbb920e9 100644 (file)
--- a/drivers/serial/sunzilog.c
+++ b/drivers/serial/sunzilog.c
@@ -329,8 +329,8 @@ sunzilog_receive_chars(struct uart_sunzilog_port *up,
 
        tty = NULL;
        if (up->port.info != NULL &&            /* Unopened serial console */
-           up->port.info->tty != NULL)         /* Keyboard || mouse */
-               tty = up->port.info->tty;
+           up->port.info->port.tty != NULL)    /* Keyboard || mouse */
+               tty = up->port.info->port.tty;
 
        for (;;) {
 
@@ -1023,7 +1023,7 @@ static struct uart_sunzilog_port *sunzilog_irq_chain;
 
 static struct uart_driver sunzilog_reg = {
        .owner          =       THIS_MODULE,
-       .driver_name    =       "ttyS",
+       .driver_name    =       "sunzilog",
        .dev_name       =       "ttyS",
        .major          =       TTY_MAJOR,
 };