diff options
| author | Paolo Abeni | 2022-04-15 09:26:00 +0200 |
|---|---|---|
| committer | Paolo Abeni | 2022-04-15 09:26:00 +0200 |
| commit | edf45f007a31e86738f6be3065591ddad94477d1 (patch) | |
| tree | 2805eeead7a03344a2b1185314d791a65fe15dc1 /net/nfc | |
| parent | caf968b483351d8825e68b06d77de5eb618aeb64 (diff) | |
| parent | d20339fa93e9810fcf87518bdd62e44f62bb64ee (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Diffstat (limited to 'net/nfc')
| -rw-r--r-- | net/nfc/nci/core.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c index d2537383a3e8..6a193cce2a75 100644 --- a/net/nfc/nci/core.c +++ b/net/nfc/nci/core.c @@ -560,6 +560,10 @@ static int nci_close_device(struct nci_dev *ndev) mutex_lock(&ndev->req_lock); if (!test_and_clear_bit(NCI_UP, &ndev->flags)) { + /* Need to flush the cmd wq in case + * there is a queued/running cmd_work + */ + flush_workqueue(ndev->cmd_wq); del_timer_sync(&ndev->cmd_timer); del_timer_sync(&ndev->data_timer); mutex_unlock(&ndev->req_lock); |