diff options
| author | Ilan Elias <ilane@ti.com> | 2012-01-08 11:21:53 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-01-24 14:08:38 -0500 |
| commit | bd7e01bc7e7a90b33470173618f6f6805143cd42 (patch) | |
| tree | 6ded85d2d1559bec5e0dbdbda81acd7ebb1acb0b /net/nfc/nci | |
| parent | ca742cd9766ff519b0e927a9296e29541ee13c7b (diff) | |
| download | linux-3.10-bd7e01bc7e7a90b33470173618f6f6805143cd42.tar.gz linux-3.10-bd7e01bc7e7a90b33470173618f6f6805143cd42.tar.bz2 linux-3.10-bd7e01bc7e7a90b33470173618f6f6805143cd42.zip | |
NFC: Complete NCI deactivate in deactivate_ntf
If a target was active, complete the NCI deactivate request
only in deactivate_ntf. Otherwise, complete it at deactivate_rsp.
Deactivate_ntf represents the actual disconnection event (sent from
the NCI controller).
Signed-off-by: Ilan Elias <ilane@ti.com>
Acked-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/nfc/nci')
| -rw-r--r-- | net/nfc/nci/ntf.c | 2 | ||||
| -rw-r--r-- | net/nfc/nci/rsp.c | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/net/nfc/nci/ntf.c b/net/nfc/nci/ntf.c index b16a8dc2afb..10682bf7029 100644 --- a/net/nfc/nci/ntf.c +++ b/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/net/nfc/nci/rsp.c b/net/nfc/nci/rsp.c index 2840ae2f361..3c73e92eb62 100644 --- a/net/nfc/nci/rsp.c +++ b/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) |