From: Julien Lefrique <lefrique@marvell.com>
Date: Tue, 21 Oct 2014 14:52:52 +0000 (+0200)
Subject: NFC: NCI: Handle Discovery deactivation type
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=6ff5462b678db88fa35fda9016d53c32f18eed5f;p=deliverable%2Flinux.git

NFC: NCI: Handle Discovery deactivation type

When the deactivation type reported by RF_DEACTIVATE_NTF is Discovery, go in
RFST_DISCOVERY state. The NFCC stays in Poll mode and/or Listen mode.

Signed-off-by: Julien Lefrique <lefrique@marvell.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
---

diff --git a/net/nfc/nci/ntf.c b/net/nfc/nci/ntf.c
index 46b2a90ac55a..8d337aa0cf52 100644
--- a/net/nfc/nci/ntf.c
+++ b/net/nfc/nci/ntf.c
@@ -681,7 +681,10 @@ static void nci_rf_deactivate_ntf_packet(struct nci_dev *ndev,
 		nci_data_exchange_complete(ndev, NULL, -EIO);
 
 	nci_clear_target_list(ndev);
-	atomic_set(&ndev->state, NCI_IDLE);
+	if (ntf->type == NCI_DEACTIVATE_TYPE_DISCOVERY)
+		atomic_set(&ndev->state, NCI_DISCOVERY);
+	else
+		atomic_set(&ndev->state, NCI_IDLE);
 	nci_req_complete(ndev, NCI_STATUS_OK);
 }