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

[sfrench/cifs-2.6.git] / drivers / char / nozomi.c

diff --git a/drivers/char/nozomi.c b/drivers/char/nozomi.c
index a6638003f530ff55688231f2acf09b3e12262b05..18af923093c3362e7c24c001fe2a85f8e12a3477 100644 (file)
--- a/drivers/char/nozomi.c
+++ b/drivers/char/nozomi.c
@@ -1611,6 +1611,8 @@ static int ntty_install(struct tty_driver *driver, struct tty_struct *tty)
        ret = tty_init_termios(tty);
        if (ret == 0) {
                tty_driver_kref_get(driver);
+               tty->count++;
+               tty->driver_data = port;
                driver->ttys[tty->index] = tty;
        }
        return ret;
@@ -1639,7 +1641,7 @@ static int ntty_activate(struct tty_port *tport, struct tty_struct *tty)
 
 static int ntty_open(struct tty_struct *tty, struct file *filp)
 {
-       struct port *port = get_port_by_tty(tty);
+       struct port *port = tty->driver_data;
        return tty_port_open(&port->port, tty, filp);
 }