diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-28 18:05:50 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-28 18:05:50 -0400 |
| commit | b0d44c0dbbd52effb731b1c0af9afd56215c48de (patch) | |
| tree | 3237c0087d91a5390aed05689b9f610ba16fa116 /net/unix | |
| parent | 9537a48ed4b9e4b738943d6da0a0fd4278adf905 (diff) | |
| parent | 7c730ccdc1188b97f5c8cb690906242c7ed75c22 (diff) | |
Merge branch 'linus' into core/iommu
Conflicts:
arch/x86/Kconfig
Diffstat (limited to 'net/unix')
| -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) |