From 773a4a4a49bfd62d53d918539d7a7623506d3f2b Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Thu, 21 May 2009 15:22:02 -0700 Subject: [PATCH] --- yaml --- r: 145275 b: refs/heads/master c: 0975ecba3b670df7c488a5e0e6fe9f1f370a8ad8 h: refs/heads/master i: 145273: 67ec96351572513fac837b5ad5d4a23636f0dede 145271: c9db5b228f0d047cdb8341d31565524e3034eb2b v: v3 --- [refs] | 2 +- trunk/net/rxrpc/ar-connection.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index ddf71f728c87..2b299f02abd6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3ed18d76d959e5cbfa5d70c8f7ba95476582a556 +refs/heads/master: 0975ecba3b670df7c488a5e0e6fe9f1f370a8ad8 diff --git a/trunk/net/rxrpc/ar-connection.c b/trunk/net/rxrpc/ar-connection.c index 0f1218b8d289..67e38a056240 100644 --- a/trunk/net/rxrpc/ar-connection.c +++ b/trunk/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;