[PATCH v5] Bluetooth: hci_qca: Cleanup on all setup failures
From: Jinwang Li <hidden>
Date: 2026-02-05 06:26:14
Also in:
linux-arm-msm, lkml
Subsystem:
bluetooth drivers, qualcomm bluetooth driver, the rest · Maintainers:
Marcel Holtmann, Luiz Augusto von Dentz, Bartosz Golaszewski, Linus Torvalds
The setup process previously combined error handling and retry gating
under one condition. As a result, the final failed attempt exited
without performing cleanup.
Update the failure path to always perform power and port cleanup on
setup failure, and reopen the port only when retrying.
Fixes: 9e80587aba4c ("Bluetooth: hci_qca: Enhance retry logic in qca_setup")
Signed-off-by: Jinwang Li <redacted>
Reviewed-by: Bartosz Golaszewski <redacted>
---
V4 -> V5:
- Close and reopen the serdev only on retry attempts.
- When the open fails, hci_dev_open_sync() will run its cleanup path.
- Link to v4
https://lore.kernel.org/all/20260106094310.784564-1-jinwang.li@oss.qualcomm.com/ (local)
V3 -> V4:
- Add 'Fixes:' tag.
- Link to v3
https://lore.kernel.org/all/20260105141427.196411-1-jinwang.li@oss.qualcomm.com/ (local)
V2 -> V3:
- Update git name.
- Link to v2
https://lore.kernel.org/all/20251226102707.3449789-1-jinwang.li@oss.qualcomm.com/ (local)
V1 -> V2:
- Only reopen the serdev port when retrying.
- Return on the final failure.
- Update commit.
- Link to v1
https://lore.kernel.org/all/20251222123824.3000167-1-jinwang.li@oss.qualcomm.com/ (local)
drivers/bluetooth/hci_qca.c | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
index b54350317a43..ab6bfc1d7197 100644
--- a/drivers/bluetooth/hci_qca.c
+++ b/drivers/bluetooth/hci_qca.c@@ -2045,19 +2045,23 @@ static int qca_setup(struct hci_uart *hu) } out: - if (ret && retries < MAX_INIT_RETRIES) { - bt_dev_warn(hdev, "Retry BT power ON:%d", retries); + if (ret) { qca_power_shutdown(hu); - if (hu->serdev) { - serdev_device_close(hu->serdev); - ret = serdev_device_open(hu->serdev); - if (ret) { - bt_dev_err(hdev, "failed to open port"); - return ret; + + if (retries < MAX_INIT_RETRIES) { + bt_dev_warn(hdev, "Retry BT power ON:%d", retries); + if (hu->serdev) { + serdev_device_close(hu->serdev); + ret = serdev_device_open(hu->serdev); + if (ret) { + bt_dev_err(hdev, "failed to open port"); + return ret; + } } + retries++; + goto retry; } - retries++; - goto retry; + return ret; } /* Setup bdaddr */
--
2.34.1