Some resources freed in the remove function are not handled by the error
handling path of the probe.
Add the needed function calls.
Fixes: c2b636b3f788 ("Bluetooth: btintel_pcie: Add support for PCIe transport")
Signed-off-by: Christophe JAILLET <[email protected]>
---
Compile tested only.
Maybe incomplete.
---
drivers/bluetooth/btintel_pcie.c | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/drivers/bluetooth/btintel_pcie.c b/drivers/bluetooth/btintel_pcie.c
index 5b6805d87fcf..d572576d0dbc 100644
--- a/drivers/bluetooth/btintel_pcie.c
+++ b/drivers/bluetooth/btintel_pcie.c
@@ -1280,17 +1280,17 @@ static int btintel_pcie_probe(struct pci_dev *pdev,
err = btintel_pcie_config_pcie(pdev, data);
if (err)
- goto exit_error;
+ goto exit_destroy_worqueue;
pci_set_drvdata(pdev, data);
err = btintel_pcie_alloc(data);
if (err)
- goto exit_error;
+ goto exit_free_irq_vectors;
err = btintel_pcie_enable_bt(data);
if (err)
- goto exit_error;
+ goto exit_free_pcie;
/* CNV information (CNVi and CNVr) is in CSR */
data->cnvi = btintel_pcie_rd_reg32(data, BTINTEL_PCIE_CSR_HW_REV_REG);
@@ -1299,17 +1299,25 @@ static int btintel_pcie_probe(struct pci_dev *pdev,
err = btintel_pcie_start_rx(data);
if (err)
- goto exit_error;
+ goto exit_free_pcie;
err = btintel_pcie_setup_hdev(data);
if (err)
- goto exit_error;
+ goto exit_free_pcie;
bt_dev_dbg(data->hdev, "cnvi: 0x%8.8x cnvr: 0x%8.8x", data->cnvi,
data->cnvr);
return 0;
-exit_error:
+exit_free_pcie:
+ btintel_pcie_free(data);
+
+exit_free_irq_vectors:
+ pci_free_irq_vectors(pdev);
+
+exit_destroy_worqueue:
+ destroy_workqueue(data->workqueue);
+
/* reset device before exit */
btintel_pcie_reset_bt(data);
--
2.45.1