diff --git a/[refs] b/[refs]
index 97b4da227d1d..8818446450ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f00171125384b46e5088b7d7a5d0b3e6972f1ee
+refs/heads/master: eeec32a731631a9bad9abb21c626b9f2840bee0d
diff --git a/trunk/drivers/char/nozomi.c b/trunk/drivers/char/nozomi.c
index 7d73cd430340..2ad7d37afbd0 100644
--- a/trunk/drivers/char/nozomi.c
+++ b/trunk/drivers/char/nozomi.c
@@ -1651,10 +1651,10 @@ static void ntty_close(struct tty_struct *tty, struct file *file)
 
 	dc->open_ttys--;
 	port->count--;
-	tty_port_tty_set(port, NULL);
 
 	if (port->count == 0) {
 		DBG1("close: %d", nport->token_dl);
+		tty_port_tty_set(port, NULL);
 		spin_lock_irqsave(&dc->spin_mutex, flags);
 		dc->last_ier &= ~(nport->token_dl);
 		writew(dc->last_ier, dc->reg_ier);