diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-02 10:33:42 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-02 10:33:51 -0400 |
| commit | 83f2f0ed715eb15a8e13c07df479d65bbc10d8d5 (patch) | |
| tree | e47d7edefa210b328f8cfba43d170fc67d6e0671 /net/unix/af_unix.c | |
| parent | 3de46fda4c104deef17ec70f85361f5c6b84ce0e (diff) | |
| parent | 4fe70410d9a219dabb47328effccae7e7f2a6e26 (diff) | |
Merge branch 'linus' into x86/urgent
Merge needed to go past commit 7ca43e756 (mm: use debug_kmap_atomic)
and fix it.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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) |