diff options
| author | David S. Miller <davem@davemloft.net> | 2012-02-06 15:35:14 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-02-06 15:35:14 -0500 |
| commit | 59d74026fa4b5df72a268f1e9578af500154ad07 (patch) | |
| tree | 4b6058de06d70c5080a63178475708a686954c84 /net/nfc/nci/data.c | |
| parent | a0417fa3a18a14be1f4d9cffcf378a7c42d92a91 (diff) | |
| parent | 8926574c4d0055ca4c4a02d1f6b2c249d01a0621 (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
Diffstat (limited to 'net/nfc/nci/data.c')
| -rw-r--r-- | net/nfc/nci/data.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/nfc/nci/data.c b/net/nfc/nci/data.c index e5756b30e602..7880ae924d5e 100644 --- a/net/nfc/nci/data.c +++ b/net/nfc/nci/data.c @@ -44,6 +44,10 @@ void nci_data_exchange_complete(struct nci_dev *ndev, pr_debug("len %d, err %d\n", skb ? skb->len : 0, err); + /* data exchange is complete, stop the data timer */ + del_timer_sync(&ndev->data_timer); + clear_bit(NCI_DATA_EXCHANGE_TO, &ndev->flags); + if (cb) { ndev->data_exchange_cb = NULL; ndev->data_exchange_cb_context = 0; |