---

yaml --- r: 338417 b: refs/heads/master c: 81c7983 h: refs/heads/master i: 338415: 1b6cf9b v: v3
git-mirror · Nov 16, 2012 · 36f1d34 · 36f1d34
1 parent b275041
commit 36f1d34
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7342c59a44ad9e5f30baaa2de84830f40b9f06c0
+refs/heads/master: 81c79838ca24f48e0e4bb96502d131d6af758ae0
diff --git a/trunk/drivers/tty/pty.c b/trunk/drivers/tty/pty.c
@@ -408,7 +408,7 @@ static void pty_unix98_shutdown(struct tty_struct *tty)
 static void pty_cleanup(struct tty_struct *tty)
 {
 	tty->port->itty = NULL;
-	kfree(tty->port);
+	tty_port_put(tty->port);
 }
 
 /* Traditional BSD devices */

diff --git a/trunk/drivers/tty/tty_port.c b/trunk/drivers/tty/tty_port.c
@@ -128,7 +128,7 @@ static void tty_port_destructor(struct kref *kref)
 	if (port->xmit_buf)
 		free_page((unsigned long)port->xmit_buf);
 	tty_buffer_free_all(port);
-	if (port->ops->destruct)
+	if (port->ops && port->ops->destruct)
 		port->ops->destruct(port);
 	else
 		kfree(port);