xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NFC: Clearly separate NCI states from flags

Browse Source 
Make a clear separation between NCI states and flags.
This is required in order to support more NCI states (e.g.
for multiple targets support).

Signed-off-by: Ilan Elias <ilane@ti.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Ilan Elias
2012-01-18 13:16:12 +02:00
committed by John W. Linville
parent 6d810f1032
commit 8939e47fc9
4 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
net/nfc/nci/rsp.c
View File

@@ -137,7 +137,7 @@ static void nci_rf_disc_rsp_packet(struct nci_dev *ndev, struct sk_buff *skb)
pr_debug("status 0x%x\n", status);
if (status == NCI_STATUS_OK)
set_bit(NCI_DISCOVERY, &ndev->flags);
atomic_set(&ndev->state, NCI_DISCOVERY);
nci_req_complete(ndev, status);
}
@@ -149,12 +149,12 @@ static void nci_rf_deactivate_rsp_packet(struct nci_dev *ndev,
pr_debug("status 0x%x\n", status);
clear_bit(NCI_DISCOVERY, &ndev->flags);
/* If target was active, complete the request only in deactivate_ntf */
if ((status != NCI_STATUS_OK) ||
(!test_bit(NCI_POLL_ACTIVE, &ndev->flags)))
(atomic_read(&ndev->state) != NCI_POLL_ACTIVE)) {
atomic_set(&ndev->state, NCI_IDLE);
nci_req_complete(ndev, status);
}
}
void nci_rsp_packet(struct nci_dev *ndev, struct sk_buff *skb)