From 53e0465f1321db56c84255bbf3acc3352ee28e23 Mon Sep 17 00:00:00 2001 From: Samuel Ortiz Date: Mon, 5 Mar 2012 01:03:48 +0100 Subject: [PATCH] --- yaml --- r: 291223 b: refs/heads/master c: 0c31835993e622fa9d407807e384c0f9b971d53b h: refs/heads/master i: 291221: a873e1b3bb12111eabc9e0460f248947f2e57679 291219: 8517cbf8b44fc7645f98fca568a2472e241828c1 291215: d177afef2a6659fc95af74ed152ef74a651ad515 v: v3 --- [refs] | 2 +- trunk/net/nfc/llcp/sock.c | 16 +++------------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index 13e03d5a4d0a..cf060345b2c7 100644 --- 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 index b8bef367ee49..d3861773fab0 100644 --- 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);