diff options
| author | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2026-09-29 10:47:49 -0400 |
|---|---|---|
| committer | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2026-09-29 10:47:49 -0400 |
| commit | 09adcc874570d1f00a43597a818eb961c66957a6 (patch) | |
| tree | aa3605e7c985c3aab4b6e37518c6874fb73fc743 /drivers/bluetooth | |
| parent | 33a010a5ca195ad92d56828fa129e229a31b8db8 (diff) | |
| parent | 1465494e8d07426fa41c0021530cccb2a1ac38fa (diff) | |
| download | linux-next-09adcc874570d1f00a43597a818eb961c66957a6.tar.gz linux-next-09adcc874570d1f00a43597a818eb961c66957a6.zip | |
Merge branch 'bluetooth' into bluetooth-next
Diffstat (limited to 'drivers/bluetooth')
| -rw-r--r-- | drivers/bluetooth/btintel_pcie.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/bluetooth/btintel_pcie.c b/drivers/bluetooth/btintel_pcie.c index 84a6cf2f4920..0376146fc939 100644 --- a/drivers/bluetooth/btintel_pcie.c +++ b/drivers/bluetooth/btintel_pcie.c @@ -536,7 +536,7 @@ static int btintel_pcie_send_sync(struct btintel_pcie_data *data, tfd_index = data->ia.tr_hia[BTINTEL_PCIE_TXQ_NUM]; - if (tfd_index > txq->count) + if (tfd_index >= txq->count) return -ERANGE; if (skb->len > BTINTEL_PCIE_BUFFER_SIZE - BTINTEL_PCIE_HCI_TYPE_LEN) { @@ -2876,6 +2876,13 @@ static int btintel_pcie_config_pcie(struct pci_dev *pdev, if (IS_ERR(data->base_addr)) return PTR_ERR(data->base_addr); + /* Do shared hardware reset to ensure a clean start before + * configuring interrupts. + */ + err = btintel_pcie_reset_bt(data); + if (err) + return err; + err = btintel_pcie_setup_irq(data); if (err) return err; |