diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-02-12 15:05:33 -0600 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-02-12 15:05:33 -0600 |
| commit | b747664516aaced3395f8969f291703fd5d879d7 (patch) | |
| tree | 9db10859238ee11a67ca86d0abd6bc47888a3e72 /net/rxrpc | |
| parent | 8e08f6eb34af13b78d379a025e4c9f8612b47b95 (diff) | |
| parent | 071a0bc2ceace31266836801510879407a3701fa (diff) | |
| download | kernel-crypto-b747664516aaced3395f8969f291703fd5d879d7.tar.gz kernel-crypto-b747664516aaced3395f8969f291703fd5d879d7.tar.xz kernel-crypto-b747664516aaced3395f8969f291703fd5d879d7.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'net/rxrpc')
| -rw-r--r-- | net/rxrpc/af_rxrpc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/rxrpc/af_rxrpc.c b/net/rxrpc/af_rxrpc.c index d7d2bed7a69..eac5e7bb736 100644 --- a/net/rxrpc/af_rxrpc.c +++ b/net/rxrpc/af_rxrpc.c @@ -284,13 +284,13 @@ struct rxrpc_call *rxrpc_kernel_begin_call(struct socket *sock, if (IS_ERR(trans)) { call = ERR_CAST(trans); trans = NULL; - goto out; + goto out_notrans; } } else { trans = rx->trans; if (!trans) { call = ERR_PTR(-ENOTCONN); - goto out; + goto out_notrans; } atomic_inc(&trans->usage); } @@ -315,6 +315,7 @@ struct rxrpc_call *rxrpc_kernel_begin_call(struct socket *sock, rxrpc_put_bundle(trans, bundle); out: rxrpc_put_transport(trans); +out_notrans: release_sock(&rx->sk); _leave(" = %p", call); return call; |