Merge tag 'ib-mfd-regulator-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into regulator-tps65090

Immutable branch between MFD and Regulator due for v3.16 merge-window.

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index d3448a90f0f9..34110719fe03 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -878,9 +878,8 @@ void disassociate_ctty(int on_exit)
         spin_lock_irq(&current->sighand->siglock);
         put_pid(current->signal->tty_old_pgrp);
         current->signal->tty_old_pgrp = NULL;
-        spin_unlock_irq(&current->sighand->siglock);
 
-        tty = get_current_tty();
+        tty = tty_kref_get(current->signal->tty);
         if (tty) {
                 unsigned long flags;
                 spin_lock_irqsave(&tty->ctrl_lock, flags);
@@ -897,6 +896,7 @@ void disassociate_ctty(int on_exit)
 #endif
         }
 
+        spin_unlock_irq(&current->sighand->siglock);
         /* Now clear signal->tty under the lock */
         read_lock(&tasklist_lock);
         session_clear_tty(task_session(current));