diff options
author | Axel Lin <axel.lin@ingics.com> | 2014-02-13 00:25:48 -0500 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2014-02-23 17:32:18 -0500 |
commit | 9bec44bf0bcd623b5ea48ae1ce44205260ad4b77 (patch) | |
tree | 0fe89e0fd0243370d05e023453a5a30eab0f335d /net/nfc/nci/core.c | |
parent | 6ea7398d00345a33b47d905875416ca4421838de (diff) |
NFC: NCI: Use reinit_completion() at appropriate places
Calling init_completion() once is enough.
Then use reinit_completion() instead in __nci_request() and nci_spi_send().
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'net/nfc/nci/core.c')
-rw-r--r-- | net/nfc/nci/core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c index 46bda010bf11..28d07626b14d 100644 --- a/net/nfc/nci/core.c +++ b/net/nfc/nci/core.c | |||
@@ -74,7 +74,7 @@ static int __nci_request(struct nci_dev *ndev, | |||
74 | 74 | ||
75 | ndev->req_status = NCI_REQ_PEND; | 75 | ndev->req_status = NCI_REQ_PEND; |
76 | 76 | ||
77 | init_completion(&ndev->req_completion); | 77 | reinit_completion(&ndev->req_completion); |
78 | req(ndev, opt); | 78 | req(ndev, opt); |
79 | completion_rc = | 79 | completion_rc = |
80 | wait_for_completion_interruptible_timeout(&ndev->req_completion, | 80 | wait_for_completion_interruptible_timeout(&ndev->req_completion, |
@@ -709,6 +709,7 @@ struct nci_dev *nci_allocate_device(struct nci_ops *ops, | |||
709 | ndev->ops = ops; | 709 | ndev->ops = ops; |
710 | ndev->tx_headroom = tx_headroom; | 710 | ndev->tx_headroom = tx_headroom; |
711 | ndev->tx_tailroom = tx_tailroom; | 711 | ndev->tx_tailroom = tx_tailroom; |
712 | init_completion(&ndev->req_completion); | ||
712 | 713 | ||
713 | ndev->nfc_dev = nfc_allocate_device(&nci_nfc_ops, | 714 | ndev->nfc_dev = nfc_allocate_device(&nci_nfc_ops, |
714 | supported_protocols, | 715 | supported_protocols, |