diff options
| author | Dan Carpenter <error27@gmail.com> | 2009-05-22 00:22:02 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-22 00:22:02 +0200 |
| commit | 0975ecba3b670df7c488a5e0e6fe9f1f370a8ad8 (patch) | |
| tree | fc1470042a6c52fbd1332fe12b57105d35fcf9e2 | |
| parent | ipv4: Fix oops with FIB_TRIE (diff) | |
| download | linux-0975ecba3b670df7c488a5e0e6fe9f1f370a8ad8.tar.xz linux-0975ecba3b670df7c488a5e0e6fe9f1f370a8ad8.zip | |
RxRPC: Error handling for rxrpc_alloc_connection()
rxrpc_alloc_connection() doesn't return an error code on failure, it just
returns NULL. IS_ERR(NULL) is false.
Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/rxrpc/ar-connection.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/rxrpc/ar-connection.c b/net/rxrpc/ar-connection.c index 0f1218b8d289..67e38a056240 100644 --- a/net/rxrpc/ar-connection.c +++ b/net/rxrpc/ar-connection.c @@ -343,9 +343,9 @@ static int rxrpc_connect_exclusive(struct rxrpc_sock *rx, /* not yet present - create a candidate for a new connection * and then redo the check */ conn = rxrpc_alloc_connection(gfp); - if (IS_ERR(conn)) { - _leave(" = %ld", PTR_ERR(conn)); - return PTR_ERR(conn); + if (!conn) { + _leave(" = -ENOMEM"); + return -ENOMEM; } conn->trans = trans; @@ -508,9 +508,9 @@ int rxrpc_connect_call(struct rxrpc_sock *rx, /* not yet present - create a candidate for a new connection and then * redo the check */ candidate = rxrpc_alloc_connection(gfp); - if (IS_ERR(candidate)) { - _leave(" = %ld", PTR_ERR(candidate)); - return PTR_ERR(candidate); + if (!candidate) { + _leave(" = -ENOMEM"); + return -ENOMEM; } candidate->trans = trans; |