Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest

1 files changed, 1 insertions, 1 deletions

diff --git a/net/ipx/af_ipx.c b/net/ipx/af_ipx.c
index 2731b51923d1..9680226640ef 100644
--- a/net/ipx/af_ipx.c
+++ b/net/ipx/af_ipx.c
@@ -148,7 +148,6 @@ static void ipx_destroy_socket(struct sock *sk)
         ipx_remove_socket(sk);
         skb_queue_purge(&sk->sk_receive_queue);
         sk_refcnt_debug_dec(sk);
-        sock_put(sk);
 }
 
 /*
@@ -1404,6 +1403,7 @@ static int ipx_release(struct socket *sock)
         sk_refcnt_debug_release(sk);
         ipx_destroy_socket(sk);
         release_sock(sk);
+        sock_put(sk);
 out:
         return 0;
 }