diff options
| author | David S. Miller <davem@davemloft.net> | 2010-01-23 03:31:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-23 03:31:06 -0500 |
| commit | 51c24aaacaea90c8e87f1dec75a2ac7622b593f8 (patch) | |
| tree | 9f54936c87764bef75e97395cb56b7d1e0df24c6 /drivers/char/tty_io.c | |
| parent | 4276e47e2d1c85a2477caf0d22b91c4f2377fba8 (diff) | |
| parent | 6be325719b3e54624397e413efd4b33a997e55a3 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/char/tty_io.c')
| -rw-r--r-- | drivers/char/tty_io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c index f15df40bc318..c6f3b48be9dd 100644 --- a/drivers/char/tty_io.c +++ b/drivers/char/tty_io.c | |||
| @@ -1951,8 +1951,8 @@ static int tty_fasync(int fd, struct file *filp, int on) | |||
| 1951 | pid = task_pid(current); | 1951 | pid = task_pid(current); |
| 1952 | type = PIDTYPE_PID; | 1952 | type = PIDTYPE_PID; |
| 1953 | } | 1953 | } |
| 1954 | spin_unlock_irqrestore(&tty->ctrl_lock, flags); | ||
| 1955 | retval = __f_setown(filp, pid, type, 0); | 1954 | retval = __f_setown(filp, pid, type, 0); |
| 1955 | spin_unlock_irqrestore(&tty->ctrl_lock, flags); | ||
| 1956 | if (retval) | 1956 | if (retval) |
| 1957 | goto out; | 1957 | goto out; |
| 1958 | } else { | 1958 | } else { |