1 files changed, 6 insertions, 7 deletions

diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
index 79ff3a5e925d..755600f6120f 100644
--- a/drivers/tty/pty.c
+++ b/drivers/tty/pty.c
@@ -47,7 +47,6 @@ static void pty_close(struct tty_struct *tty, struct file *filp)
         /* Review - krefs on tty_link ?? */
         if (!tty->link)
                 return;
-        tty->link->packet = 0;
         set_bit(TTY_OTHER_CLOSED, &tty->link->flags);
         wake_up_interruptible(&tty->link->read_wait);
         wake_up_interruptible(&tty->link->write_wait);
@@ -55,9 +54,9 @@ static void pty_close(struct tty_struct *tty, struct file *filp)
                 set_bit(TTY_OTHER_CLOSED, &tty->flags);
 #ifdef CONFIG_UNIX98_PTYS
                 if (tty->driver == ptm_driver) {
-                        mutex_lock(&devpts_mutex);
+                        mutex_lock(&devpts_mutex);
                         devpts_pty_kill(tty->link->driver_data);
-                        mutex_unlock(&devpts_mutex);
+                        mutex_unlock(&devpts_mutex);
                 }
 #endif
                 tty_unlock(tty);
@@ -120,10 +119,10 @@ static int pty_write(struct tty_struct *tty, const unsigned char *buf, int c)
 
         if (c > 0) {
                 /* Stuff the data into the input queue of the other end */
-                c = tty_insert_flip_string(to, buf, c);
+                c = tty_insert_flip_string(to->port, buf, c);
                 /* And shovel */
                 if (c) {
-                        tty_flip_buffer_push(to);
+                        tty_flip_buffer_push(to->port);
                         tty_wakeup(tty);
                 }
         }
@@ -663,7 +662,7 @@ static const struct tty_operations pty_unix98_ops = {
  *      Allocate a unix98 pty master device from the ptmx driver.
  *
  *      Locking: tty_mutex protects the init_dev work. tty->count should
- *              protect the rest.
+ *              protect the rest.
  *              allocated_ptys_lock handles the list of free pty numbers
  */
 
@@ -797,7 +796,7 @@ static void __init unix98_pty_init(void)
         cdev_init(&ptmx_cdev, &ptmx_fops);
         if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
             register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0)
-                panic("Couldn't register /dev/ptmx driver\n");
+                panic("Couldn't register /dev/ptmx driver");
         device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 2), NULL, "ptmx");
 }