---

yaml --- r: 315299 b: refs/heads/master c: 8b7e8ed h: refs/heads/master i: 315297: c797bc7 315295: 021cf10 v: v3
git-mirror · Jul 9, 2012 · 6007cf5 · 6007cf5
1 parent e78c233
commit 6007cf5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cbbf472181bd5d6229decda96b34b0c2bbcb3050
+refs/heads/master: 8b7e8eda58cc09974708dcc6db4c202c419d6cd9
diff --git a/trunk/net/nfc/llcp/sock.c b/trunk/net/nfc/llcp/sock.c
@@ -121,8 +121,10 @@ static int llcp_sock_bind(struct socket *sock, struct sockaddr *addr, int alen)
 					  GFP_KERNEL);
 
 	llcp_sock->ssap = nfc_llcp_get_sdp_ssap(local, llcp_sock);
-	if (llcp_sock->ssap == LLCP_MAX_SAP)
+	if (llcp_sock->ssap == LLCP_SAP_MAX) {
+		ret = -EADDRINUSE;
 		goto put_dev;
+	}
 
 	llcp_sock->reserved_ssap = llcp_sock->ssap;