1 files changed, 7 insertions, 2 deletions

diff --git a/drivers/char/tty_ldisc.c b/drivers/char/tty_ldisc.c
index 39c8f86dedd..a19e935847b 100644
--- a/drivers/char/tty_ldisc.c
+++ b/drivers/char/tty_ldisc.c
@@ -148,8 +148,10 @@ static struct tty_ldisc *tty_ldisc_try_get(int disc)
                 }
         }
         spin_unlock_irqrestore(&tty_ldisc_lock, flags);
-        if (err)
+        if (err) {
+                kfree(ld);
                 return ERR_PTR(err);
+        }
         return ld;
 }
 
@@ -205,6 +207,7 @@ static void tty_ldisc_put(struct tty_ldisc *ld)
         ldo->refcount--;
         module_put(ldo->owner);
         spin_unlock_irqrestore(&tty_ldisc_lock, flags);
+        WARN_ON(ld->refcount);
         kfree(ld);
 }
 
@@ -262,7 +265,7 @@ const struct file_operations tty_ldiscs_proc_fops = {
  *      @ld: line discipline
  *
  *      Install an instance of a line discipline into a tty structure. The
- *      ldisc must have a reference count above zero to ensure it remains/
+ *      ldisc must have a reference count above zero to ensure it remains.
  *      The tty instance refcount starts at zero.
  *
  *      Locking:
@@ -791,6 +794,8 @@ void tty_ldisc_hangup(struct tty_struct *tty)
                 /* Avoid racing set_ldisc */
                 mutex_lock(&tty->ldisc_mutex);
                 /* Switch back to N_TTY */
+                tty_ldisc_halt(tty);
+                tty_ldisc_wait_idle(tty);
                 tty_ldisc_reinit(tty);
                 /* At this point we have a closed ldisc and we want to
                    reopen it. We could defer this to the next open but