tty: Move the leader test in disassociate

There are two call points, both want to check that tty->signal->leader is
set. Move the test into disassociate_ctty() as that will make locking
changes easier in a bit

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index cc941a3504d7..a19fef2093f1 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -707,6 +707,8 @@ void disassociate_ctty(int on_exit)
         struct tty_struct *tty;
         struct pid *tty_pgrp = NULL;
 
+        if (!current->signal->leader)
+                return;
 
         tty = get_current_tty();
         if (tty) {
@@ -772,8 +774,7 @@ void no_tty(void)
 {
         struct task_struct *tsk = current;
         lock_kernel();
-        if (tsk->signal->leader)
-                disassociate_ctty(0);
+        disassociate_ctty(0);
         unlock_kernel();
         proc_clear_tty(tsk);
 }