diff options
| author | Ilan Elias <ilane@ti.com> | 2012-01-18 06:16:12 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-01-24 14:32:28 -0500 |
| commit | 8939e47fc953cce6ef53e79e9ff9b53319d1a72d (patch) | |
| tree | fba0ffe539b4d6937bfb2bd9986fe989917b8039 /net/nfc/nci/rsp.c | |
| parent | 6d810f10325522cfcf498dc6d64b9f96e1f5153f (diff) | |
NFC: Clearly separate NCI states from flags
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>
Diffstat (limited to 'net/nfc/nci/rsp.c')
| -rw-r--r-- | net/nfc/nci/rsp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/nfc/nci/rsp.c b/net/nfc/nci/rsp.c index 3c73e92eb625..cb8bce6899cf 100644 --- a/net/nfc/nci/rsp.c +++ b/net/nfc/nci/rsp.c | |||
| @@ -137,7 +137,7 @@ static void nci_rf_disc_rsp_packet(struct nci_dev *ndev, struct sk_buff *skb) | |||
| 137 | pr_debug("status 0x%x\n", status); | 137 | pr_debug("status 0x%x\n", status); |
| 138 | 138 | ||
| 139 | if (status == NCI_STATUS_OK) | 139 | if (status == NCI_STATUS_OK) |
| 140 | set_bit(NCI_DISCOVERY, &ndev->flags); | 140 | atomic_set(&ndev->state, NCI_DISCOVERY); |
| 141 | 141 | ||
| 142 | nci_req_complete(ndev, status); | 142 | nci_req_complete(ndev, status); |
| 143 | } | 143 | } |
| @@ -149,12 +149,12 @@ static void nci_rf_deactivate_rsp_packet(struct nci_dev *ndev, | |||
| 149 | 149 | ||
| 150 | pr_debug("status 0x%x\n", status); | 150 | pr_debug("status 0x%x\n", status); |
| 151 | 151 | ||
| 152 | clear_bit(NCI_DISCOVERY, &ndev->flags); | ||
| 153 | |||
| 154 | /* If target was active, complete the request only in deactivate_ntf */ | 152 | /* If target was active, complete the request only in deactivate_ntf */ |
| 155 | if ((status != NCI_STATUS_OK) || | 153 | if ((status != NCI_STATUS_OK) || |
| 156 | (!test_bit(NCI_POLL_ACTIVE, &ndev->flags))) | 154 | (atomic_read(&ndev->state) != NCI_POLL_ACTIVE)) { |
| 155 | atomic_set(&ndev->state, NCI_IDLE); | ||
| 157 | nci_req_complete(ndev, status); | 156 | nci_req_complete(ndev, status); |
| 157 | } | ||
| 158 | } | 158 | } |
| 159 | 159 | ||
| 160 | void nci_rsp_packet(struct nci_dev *ndev, struct sk_buff *skb) | 160 | void nci_rsp_packet(struct nci_dev *ndev, struct sk_buff *skb) |