---

yaml --- r: 289947 b: refs/heads/master c: bd7e01b h: refs/heads/master i: 289945: ca10f40 289943: cb3ae17 v: v3
git-mirror · Jan 24, 2012 · 2bfc1a9 · 2bfc1a9
1 parent 26a810a
commit 2bfc1a9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca742cd9766ff519b0e927a9296e29541ee13c7b
+refs/heads/master: bd7e01bc7e7a90b33470173618f6f6805143cd42
diff --git a/trunk/net/nfc/nci/ntf.c b/trunk/net/nfc/nci/ntf.c
@@ -280,6 +280,8 @@ static void nci_rf_deactivate_ntf_packet(struct nci_dev *ndev,
 	/* complete the data exchange transaction, if exists */
 	if (test_bit(NCI_DATA_EXCHANGE, &ndev->flags))
 		nci_data_exchange_complete(ndev, NULL, -EIO);
+
+	nci_req_complete(ndev, NCI_STATUS_OK);
 }
 
 void nci_ntf_packet(struct nci_dev *ndev, struct sk_buff *skb)

diff --git a/trunk/net/nfc/nci/rsp.c b/trunk/net/nfc/nci/rsp.c
@@ -151,7 +151,10 @@ static void nci_rf_deactivate_rsp_packet(struct nci_dev *ndev,
 
 	clear_bit(NCI_DISCOVERY, &ndev->flags);
 
-	nci_req_complete(ndev, status);
+	/* If target was active, complete the request only in deactivate_ntf */
+	if ((status != NCI_STATUS_OK) ||
+		(!test_bit(NCI_POLL_ACTIVE, &ndev->flags)))
+		nci_req_complete(ndev, status);
 }
 
 void nci_rsp_packet(struct nci_dev *ndev, struct sk_buff *skb)