---

yaml --- r: 291223 b: refs/heads/master c: 0c31835 h: refs/heads/master i: 291221: a873e1b 291219: 8517cbf 291215: d177afe v: v3
git-mirror · Mar 6, 2012 · 53e0465 · 53e0465
1 parent b6593fe
commit 53e0465
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2fbabfa467ce945deb92bf04c745b4d101fc21ee
+refs/heads/master: 0c31835993e622fa9d407807e384c0f9b971d53b
diff --git a/trunk/net/nfc/llcp/sock.c b/trunk/net/nfc/llcp/sock.c
@@ -327,20 +327,10 @@ static int llcp_sock_release(struct socket *sock)
 
 	mutex_lock(&local->socket_lock);
 
-	if (llcp_sock == local->sockets[llcp_sock->ssap]) {
+	if (llcp_sock == local->sockets[llcp_sock->ssap])
 		local->sockets[llcp_sock->ssap] = NULL;
-	} else {
-		struct nfc_llcp_sock *parent, *s, *n;
-
-		parent = local->sockets[llcp_sock->ssap];
-
-		list_for_each_entry_safe(s, n, &parent->list, list)
-			if (llcp_sock == s) {
-				list_del(&s->list);
-				break;
-			}
-
-	}
+	else
+		list_del(&llcp_sock->list);
 
 	mutex_unlock(&local->socket_lock);