From 8127e000e3351ab6b2723288b1b0186f104915c4 Mon Sep 17 00:00:00 2001 From: Samuel Ortiz Date: Mon, 21 May 2012 11:44:42 +0200 Subject: [PATCH] --- yaml --- r: 314193 b: refs/heads/master c: 5a0f6f3b46b28310262ad9585b80062ef56c5362 h: refs/heads/master i: 314191: ee4b8d50537e4fcb5724a5c148a07f173379bfcf v: v3 --- [refs] | 2 +- trunk/net/nfc/llcp/llcp.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 526d7d905f84..002b7ab61f5b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dadb06f270ad7cd9572b82995f6261f8ca4620ac +refs/heads/master: 5a0f6f3b46b28310262ad9585b80062ef56c5362 diff --git a/trunk/net/nfc/llcp/llcp.c b/trunk/net/nfc/llcp/llcp.c index 5705e6dffb32..b694313c2be5 100644 --- a/trunk/net/nfc/llcp/llcp.c +++ b/trunk/net/nfc/llcp/llcp.c @@ -477,8 +477,10 @@ static struct nfc_llcp_sock *nfc_llcp_connecting_sock_get(struct nfc_llcp_local sk_for_each(sk, node, &local->connecting_sockets.head) { llcp_sock = nfc_llcp_sock(sk); - if (llcp_sock->ssap == ssap) + if (llcp_sock->ssap == ssap) { + sock_hold(&llcp_sock->sk); goto out; + } } llcp_sock = NULL; @@ -486,8 +488,6 @@ static struct nfc_llcp_sock *nfc_llcp_connecting_sock_get(struct nfc_llcp_local out: read_unlock(&local->connecting_sockets.lock); - sock_hold(&llcp_sock->sk); - return llcp_sock; }