diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-28 18:34:14 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-28 18:34:14 -0400 |
| commit | 38a6ed3ed8e108b662f4016a1ebf068dcf4c1ef4 (patch) | |
| tree | a83d5e4e86edf6cb2de22db6f2ff2274753a2bab /net/unix/af_unix.c | |
| parent | f2d28a2ebcb525a6ec7e2152106ddb385ef52b73 (diff) | |
| parent | 7c730ccdc1188b97f5c8cb690906242c7ed75c22 (diff) | |
Merge branch 'linus' into core/printk
Diffstat (limited to 'net/unix/af_unix.c')
| -rw-r--r-- | net/unix/af_unix.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index d1b89820ab4f..baac91049b0e 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c | |||
| @@ -1178,8 +1178,7 @@ out_unlock: | |||
| 1178 | unix_state_unlock(other); | 1178 | unix_state_unlock(other); |
| 1179 | 1179 | ||
| 1180 | out: | 1180 | out: |
| 1181 | if (skb) | 1181 | kfree_skb(skb); |
| 1182 | kfree_skb(skb); | ||
| 1183 | if (newsk) | 1182 | if (newsk) |
| 1184 | unix_release_sock(newsk, 0); | 1183 | unix_release_sock(newsk, 0); |
| 1185 | if (other) | 1184 | if (other) |