From 6007cf551dcadec3aac71817484d843e02685cd7 Mon Sep 17 00:00:00 2001
From: Samuel Ortiz <sameo@linux.intel.com>
Date: Fri, 22 Jun 2012 15:32:20 +0200
Subject: [PATCH] --- yaml --- r: 315299 b: refs/heads/master c:
 8b7e8eda58cc09974708dcc6db4c202c419d6cd9 h: refs/heads/master i:   315297:
 c797bc7a3ab441a2640fb824e1f0579b32f2cc2c   315295:
 021cf1004a8810715e9d8dfdb97bdf08ffd9016d 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 25bbe871ca75..1051f4332c3e 100644
--- 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
index 211cb234f7a3..e5d80142b825 100644
--- 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;