[net-next] net: nfc: nci: Change the NCI close sequence
diff mbox series

Message ID 20201228014631.5557-1-bongsu.jeon@samsung.com
State Accepted
Commit f011539e723c737b74876ac47345e40270a3c384
Headers show
Series
  • [net-next] net: nfc: nci: Change the NCI close sequence
Related show

Commit Message

Bongsu Jeon Dec. 28, 2020, 1:46 a.m. UTC
From: Bongsu Jeon <bongsu.jeon@samsung.com>

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 <bongsu.jeon@samsung.com>
---
 net/nfc/nci/core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Jakub Kicinski Dec. 28, 2020, 9:21 p.m. UTC | #1
On Mon, 28 Dec 2020 10:46:31 +0900 Bongsu Jeon wrote:
> From: Bongsu Jeon <bongsu.jeon@samsung.com>
> 
> 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.
David Miller Jan. 6, 2021, 12:07 a.m. UTC | #2
From: Bongsu Jeon <bongsu.jeon2@gmail.com>
Date: Mon, 28 Dec 2020 10:46:31 +0900

> From: Bongsu Jeon <bongsu.jeon@samsung.com>
> 
> 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 <bongsu.jeon@samsung.com>

Applied.

Patch
diff mbox series

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;