summaryrefslogtreecommitdiffstats
path: root/net/nfc
diff options
context:
space:
mode:
authorVincent Cuissard <cuissard@marvell.com>2015-06-12 15:35:53 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2015-06-13 00:08:09 +0200
commit34ac49664149dd8923e0de5d871f86c80292d27b (patch)
treeabc15391e1b166ec491435f61d58dd468e58ad7f /net/nfc
parent83d567259b943bbe85aba563b521f7b5611c6a1c (diff)
downloadlinux-34ac49664149dd8923e0de5d871f86c80292d27b.tar.gz
linux-34ac49664149dd8923e0de5d871f86c80292d27b.tar.bz2
linux-34ac49664149dd8923e0de5d871f86c80292d27b.zip
NFC: nci: remove current SLEEP mode management
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>
Diffstat (limited to 'net/nfc')
-rw-r--r--net/nfc/nci/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c
index f9aa08780b06..95af2d24d5be 100644
--- a/net/nfc/nci/core.c
+++ b/net/nfc/nci/core.c
@@ -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));
}
}