From: Bongsu Jeon <[email protected]>
Change the NCI close sequence because the NCI Command timer should be
deleted after flushing the NCI command work queue.
Signed-off-by: Bongsu Jeon <[email protected]>
---
net/nfc/nci/core.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c
index e64727e1a72f..79bebf4b0796 100644
--- a/net/nfc/nci/core.c
+++ b/net/nfc/nci/core.c
@@ -579,11 +579,11 @@ static int nci_close_device(struct nci_dev *ndev)
clear_bit(NCI_INIT, &ndev->flags);
- del_timer_sync(&ndev->cmd_timer);
-
/* Flush cmd wq */
flush_workqueue(ndev->cmd_wq);
+ del_timer_sync(&ndev->cmd_timer);
+
/* Clear flags */
ndev->flags = 0;
--
2.17.1
On Mon, 28 Dec 2020 10:46:31 +0900 Bongsu Jeon wrote:
> From: Bongsu Jeon <[email protected]>
>
> Change the NCI close sequence because the NCI Command timer should be
> deleted after flushing the NCI command work queue.
The commit message should describe the reason - why new order is
better than the old one. The existing sentence describes what is
changing more than why.
From: Bongsu Jeon <[email protected]>
Date: Mon, 28 Dec 2020 10:46:31 +0900
> From: Bongsu Jeon <[email protected]>
>
> Change the NCI close sequence because the NCI Command timer should be
> deleted after flushing the NCI command work queue.
>
> Signed-off-by: Bongsu Jeon <[email protected]>
Applied.