diff --git a/[refs] b/[refs]
index 425525acb0bf..cf8f4ecc794c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee78bb95b7bea08b7774a02073ea2bb45611a9e1
+refs/heads/master: bf9c1fca9ae9a79ed209e7ab2c10b3862f3f6f72
diff --git a/trunk/drivers/char/nozomi.c b/trunk/drivers/char/nozomi.c
index 21ae1b158b3b..18af923093c3 100644
--- a/trunk/drivers/char/nozomi.c
+++ b/trunk/drivers/char/nozomi.c
@@ -1612,6 +1612,7 @@ static int ntty_install(struct tty_driver *driver, struct tty_struct *tty)
 	if (ret == 0) {
 		tty_driver_kref_get(driver);
 		tty->count++;
+		tty->driver_data = port;
 		driver->ttys[tty->index] = tty;
 	}
 	return ret;
@@ -1640,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);
 }