Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7979e13 authored by Julien Lefrique's avatar Julien Lefrique Committed by Samuel Ortiz
Browse files

NFC: NCI: Signal deactivation in Target mode 



Before signaling the deactivation, send a deactivation request if in
RFST_DISCOVERY state because neard assumes polling is stopped and will
try to restart it.

Signed-off-by: default avatarJulien Lefrique <lefrique@marvell.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 6ff5462b

net/nfc/nci/core.c

+16 −1
Original line number Diff line number Diff line
@@ -681,9 +681,24 @@ static int nci_dep_link_up(struct nfc_dev *nfc_dev, struct nfc_target *target, 


static int nci_dep_link_down(struct nfc_dev *nfc_dev)

{

	struct nci_dev *ndev = nfc_get_drvdata(nfc_dev);

	int rc;



	pr_debug("entry\n");



	if (nfc_dev->rf_mode == NFC_RF_INITIATOR) {

		nci_deactivate_target(nfc_dev, NULL);

	} else {

		if (atomic_read(&ndev->state) == NCI_LISTEN_ACTIVE ||

		    atomic_read(&ndev->state) == NCI_DISCOVERY) {

			nci_request(ndev, nci_rf_deactivate_req, 0,

				msecs_to_jiffies(NCI_RF_DEACTIVATE_TIMEOUT));

		}



		rc = nfc_tm_deactivated(nfc_dev);

		if (rc)

			pr_err("error when signaling tm deactivation\n");

	}



	return 0;

}