diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-28 16:29:51 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-28 16:29:51 -0400 |
commit | ed40d0c472b136682b2fcba05f89762859c7374f (patch) | |
tree | 076b83a26bcd63d6158463735dd34c10bbc591dc /net/unix/af_unix.c | |
parent | 9e495834e59ca9b29f1a1f63b9f5533bb022ac49 (diff) | |
parent | 5d80f8e5a9dc9c9a94d4aeaa567e219a808b8a4a (diff) |
Merge branch 'origin' into devel
Conflicts:
sound/soc/pxa/pxa2xx-i2s.c
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) |