[LV-commit] CVS: kernel-2.5/drivers/char tty_io.c,1.18,1.19

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/char
In directory sc8-pr-cvs1:/tmp/cvs-serv18198/drivers/char

Modified Files:
	tty_io.c 
Log Message:
Merge with 2.5.61


Index: tty_io.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/tty_io.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- tty_io.c	4 Aug 2003 12:18:14 -0000	1.18
+++ tty_io.c	5 Aug 2003 23:17:56 -0000	1.19
@@ -578,7 +578,7 @@
  */
 void disassociate_ctty(int on_exit)
 {
-	struct tty_struct *tty = current->tty;
+	struct tty_struct *tty;
 	struct task_struct *p;
 	struct list_head *l;
 	struct pid *pid;
@@ -586,6 +586,7 @@
 
 	lock_kernel();
 
+	tty = current->tty;
 	if (tty) {
 		tty_pgrp = tty->pgrp;
 		if (on_exit && tty->driver.type != TTY_DRIVER_TYPE_PTY)