Bluetooth: hci_qca: Cleanup on all setup failures

[ Upstream commit 5c4e9a8b18457ad28b57069ef0f14661e3192b2e ]

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 <jinwang.li@oss.qualcomm.com>
Reviewed-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
index a3c217571c3c45fe614755687bc8a87977f35da4..c0cc04995fc2faeafe846b0fdcbdc8ae4429608d 100644 (file)
--- a/drivers/bluetooth/hci_qca.c
+++ b/drivers/bluetooth/hci_qca.c
@@ -2045,19 +2045,23 @@ retry:
        }
 
 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 */