Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

1 files changed, 1 insertions, 3 deletions

diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 684f0e0b175e..c6f3b48be9dd 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -516,7 +516,6 @@ static void do_tty_hangup(struct work_struct *work)
         /* inuse_filps is protected by the single kernel lock */
         lock_kernel();
         check_tty_count(tty, "do_tty_hangup");
-        unlock_kernel();
 
         file_list_lock();
         /* This breaks for file handles being sent over AF_UNIX sockets ? */
@@ -531,7 +530,6 @@ static void do_tty_hangup(struct work_struct *work)
         }
         file_list_unlock();
 
-        lock_kernel();
         tty_ldisc_hangup(tty);
 
         read_lock(&tasklist_lock);
@@ -1953,8 +1951,8 @@ static int tty_fasync(int fd, struct file *filp, int on)
                         pid = task_pid(current);
                         type = PIDTYPE_PID;
                 }
-                spin_unlock_irqrestore(&tty->ctrl_lock, flags);
                 retval = __f_setown(filp, pid, type, 0);
+                spin_unlock_irqrestore(&tty->ctrl_lock, flags);
                 if (retval)
                         goto out;
         } else {