From cb90c4538677b89c9d59e3aa09ebb87f1b55c2a9 Mon Sep 17 00:00:00 2001
From: Samuel Ortiz <sameo@linux.intel.com>
Date: Tue, 26 Mar 2013 14:35:57 +0100
Subject: [PATCH] --- yaml --- r: 362270 b: refs/heads/master c:
 39a352a5b5896403ad4ce842a9bc3845a01c02cd h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/net/nfc/llcp/sock.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 50703d2f270c..462eb2c6f20d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3155155440190de78fb501953136a6c5b82e327
+refs/heads/master: 39a352a5b5896403ad4ce842a9bc3845a01c02cd
diff --git a/trunk/net/nfc/llcp/sock.c b/trunk/net/nfc/llcp/sock.c
index e488e440186a..8f025746f337 100644
--- a/trunk/net/nfc/llcp/sock.c
+++ b/trunk/net/nfc/llcp/sock.c
@@ -270,7 +270,9 @@ struct sock *nfc_llcp_accept_dequeue(struct sock *parent,
 		}
 
 		if (sk->sk_state == LLCP_CONNECTED || !newsock) {
-			nfc_llcp_accept_unlink(sk);
+			list_del_init(&lsk->accept_queue);
+			sock_put(sk);
+
 			if (newsock)
 				sock_graft(sk, newsock);