From d177afef2a6659fc95af74ed152ef74a651ad515 Mon Sep 17 00:00:00 2001
From: Samuel Ortiz <sameo@linux.intel.com>
Date: Mon, 5 Mar 2012 01:03:40 +0100
Subject: [PATCH] --- yaml --- r: 291215 b: refs/heads/master c:
 b9a76f1d3c6da47b2fa115ff1c0de229e8d06f8f h: refs/heads/master i:   291213:
 502651a94b1b5ac78b92b06e721c1974ff0ef23f   291211:
 0a570b100c1a2397de07cc2221b37fc85c963a50   291207:
 996ac469bca578de5e8a8f8a5671cd4aae92baa0   291199:
 669eebed844c0bdc191b6ff65e59674347415035 v: v3

---
 [refs]                    |  2 +-
 trunk/net/nfc/llcp/llcp.c | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0c31829c0885..c66527a8a59c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98b3ac1b980b0c0ffff24fda8d13ab8c216df4d1
+refs/heads/master: b9a76f1d3c6da47b2fa115ff1c0de229e8d06f8f
diff --git a/trunk/net/nfc/llcp/llcp.c b/trunk/net/nfc/llcp/llcp.c
index 443407e964ca..577bcb92ea9b 100644
--- a/trunk/net/nfc/llcp/llcp.c
+++ b/trunk/net/nfc/llcp/llcp.c
@@ -97,6 +97,17 @@ static void nfc_llcp_socket_release(struct nfc_llcp_local *local)
 	mutex_unlock(&local->socket_lock);
 }
 
+static void nfc_llcp_clear_sdp(struct nfc_llcp_local *local)
+{
+	mutex_lock(&local->sdp_lock);
+
+	local->local_wks = 0;
+	local->local_sdp = 0;
+	local->local_sap = 0;
+
+	mutex_unlock(&local->sdp_lock);
+}
+
 static void nfc_llcp_timeout_work(struct work_struct *work)
 {
 	struct nfc_llcp_local *local = container_of(work, struct nfc_llcp_local,
@@ -857,6 +868,8 @@ void nfc_llcp_mac_is_down(struct nfc_dev *dev)
 	if (local == NULL)
 		return;
 
+	nfc_llcp_clear_sdp(local);
+
 	/* Close and purge all existing sockets */
 	nfc_llcp_socket_release(local);
 }