diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-03-27 11:14:38 -0400 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-03-27 11:14:38 -0400 |
| commit | b92efa9abffc4a634cd2e7a0f81f8aa6310d67c9 (patch) | |
| tree | 9847508d9b8d4e585f90db4a453bfbc3700c997e /net/unix/af_unix.c | |
| parent | a16fffdd8eb95ebab7dc22414896fe6493951e0e (diff) | |
| parent | be0ea69674ed95e1e98cb3687a241badc756d228 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into avr32-arch
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) |