Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 362270
b: refs/heads/master
c: 39a352a
h: refs/heads/master
v: v3
  • Loading branch information
Samuel Ortiz committed Mar 26, 2013
1 parent ffc17e5 commit cb90c45
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b3155155440190de78fb501953136a6c5b82e327
refs/heads/master: 39a352a5b5896403ad4ce842a9bc3845a01c02cd
4 changes: 3 additions & 1 deletion trunk/net/nfc/llcp/sock.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit cb90c45

Please sign in to comment.