diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-10 03:16:27 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-10 03:16:27 -0500 |
| commit | 4ecd33d930591d41fe356160593a9076467b961c (patch) | |
| tree | b9051a334540bbce38db1b2b03cebb4cf1d51f73 /net/socket.c | |
| parent | 7d5a78cd98c3a5eb83bd6a061c5ea6ef1e9b8fcb (diff) | |
| parent | f7160c7573615ec82c691e294cf80d920b5d588d (diff) | |
Merge commit 'v2.6.28-rc4' into x86/apic
Diffstat (limited to 'net/socket.c')
| -rw-r--r-- | net/socket.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/socket.c b/net/socket.c index 2b7a4b5c9b72..57550c3bcabe 100644 --- a/net/socket.c +++ b/net/socket.c | |||
| @@ -990,7 +990,6 @@ static int sock_close(struct inode *inode, struct file *filp) | |||
| 990 | printk(KERN_DEBUG "sock_close: NULL inode\n"); | 990 | printk(KERN_DEBUG "sock_close: NULL inode\n"); |
| 991 | return 0; | 991 | return 0; |
| 992 | } | 992 | } |
| 993 | sock_fasync(-1, filp, 0); | ||
| 994 | sock_release(SOCKET_I(inode)); | 993 | sock_release(SOCKET_I(inode)); |
| 995 | return 0; | 994 | return 0; |
| 996 | } | 995 | } |
