NFC: nci: remove current SLEEP mode management
authorVincent Cuissard <cuissard@marvell.com>
Fri, 12 Jun 2015 13:35:53 +0000 (15:35 +0200)
committerSamuel Ortiz <sameo@linux.intel.com>
Fri, 12 Jun 2015 22:08:09 +0000 (00:08 +0200)
NCI deactivate management was modified to support all NCI
deactivation type. Problem is that all the API are not ready
yet for it.

Problem is that with current code, when neard asks to deactivate
the tag it sends a deactivate SLEEP but nobody will then send a
IDLE deactivate. This IDLE deactivate is mandatory since NFC
controller can only be unlocked by DH.

Signed-off-by: Vincent Cuissard <cuissard@marvell.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
net/nfc/nci/core.c

index f9aa08780b06596baa4982b39ed08133ba047a3d..95af2d24d5be7b351c097caa9cd1aead2bee2139 100644 (file)
@@ -798,7 +798,7 @@ static void nci_deactivate_target(struct nfc_dev *nfc_dev,
 
        if (atomic_read(&ndev->state) == NCI_POLL_ACTIVE) {
                nci_request(ndev, nci_rf_deactivate_req,
-                           NCI_DEACTIVATE_TYPE_SLEEP_MODE,
+                           NCI_DEACTIVATE_TYPE_IDLE_MODE,
                            msecs_to_jiffies(NCI_RF_DEACTIVATE_TIMEOUT));
        }
 }