Skip to contentSkip to conversation

nfc: nci: add missed destroy_workqueue in nci_register_device

PATCH Applied Wang Hai 2 participants 2 messages Jul 17, 2020

Subsystems (3)
lore
Share & tools
lore

Wang Hai

author
#0 lore raw

PATCH v2 1/1 nfc: nci: add missed destroy_workqueue in nci_register_device

When nfc_register_device fails in nci_register_device, destroy_workqueue() shouled be called to destroy ndev->tx_wq.

Fixes 3c1c0f5dc80b ("NFC: NCI: Fix nci_register_device init sequence")

---
v1->v2:
Change the module from "net: cxgb3:" to "nfc: nci:"

 net/nfc/nci/core.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
net/nfc/nci/core.c +4 -1
index 7cd524884304..78ea8c94dcba 100644
@@ -1228,10 +1228,13 @@ int nci_register_device(struct nci_dev *ndev)
 
 	rc = nfc_register_device(ndev->nfc_dev);
 	if (rc)
-		goto destroy_rx_wq_exit;
+		goto destroy_tx_wq_exit;
 
 	goto exit;
 
+destroy_tx_wq_exit:
+	destroy_workqueue(ndev->tx_wq);
+
 destroy_rx_wq_exit:
 	destroy_workqueue(ndev->rx_wq);
 
Signature · 1 line
2.17.1
maintainer Applied
#1 lore raw

From: Wang Hai <[email protected]>
Date: Fri, 17 Jul 2020 15:10:16 +0800

Quoted 9 lines

When nfc_register_device fails in nci_register_device, destroy_workqueue() shouled be called to destroy ndev->tx_wq.

Fixes 3c1c0f5dc80b ("NFC: NCI: Fix nci_register_device init sequence")

---
v1->v2:
Change the module from "net: cxgb3:" to "nfc: nci:"

Applied, thanks.