From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 375753D5674; Sat, 28 Feb 2026 17:40:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772300433; cv=none; b=d4BElg65mF2oNaVEAaqGnM3LxXQ1DF7OxozlFDhHXtG0PLVj4ouTF8bf3Xep8/FHF1nWcls/Kj5MvGK9/YFDu0YPHi5xG6tgjw7i0Nwj8uSIAZ5h324DQXmFGVOYOdhnDRcimj0o9mIEDjTy9WTfVcl0VxMQ5sRDuIQOylyCzVk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772300433; c=relaxed/simple; bh=vFJOB/tj3DORoPczvwwyK/P3t1OiK9PdPbshDbq73c8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HRLAC7gC2VU9zNrAmn09UbjWWH9hs2PGqDUwr4/O/q3KtUDfDj2Gq7DTzSVMpvT1Ai+QFc5fA5LDPsYWajKZazF21KcWSq6+S5qwTaU3zQbeCRrA2pyYrwe2uKKlUJ2SFnGU/2ItCj8MiFjJ3L6GR0DuPgNfwRlfqA1IkEfS5IA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=XbBXauBz; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="XbBXauBz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6C49FC116D0; Sat, 28 Feb 2026 17:40:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772300433; bh=vFJOB/tj3DORoPczvwwyK/P3t1OiK9PdPbshDbq73c8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XbBXauBzbcBWQoFGwyvhEoJXeRYytMjhj7yXnLx3kBYmNtYNwKyB9GLRTuG7nXwdz 0tokNr8sch7kdWPYnmLG9JDBEpvf5rzJMj3u0OuiTK4yVWJTzEIhU1h+1Uut1OwtYs bMgcwlyhyiqurKxA/8DjTC7AbqNNU/SgiDfNuNQgWZe2ZhhuvJNoyyVV+QLQXBVoSL yupJiESYsUbcIbkCUaozcG7k8UJrW4/4yiSd5+G0mHXvLgWCfDcK0hK2PxoVzcVKX/ heHOkhZhwmvl02jPLAW/8UMp1wzJyZsEeX1iiXgnA3UVdrqymuuHtp7ZOfNf/zwl2B 3tBr06DI2OrhA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jinwang Li , Bartosz Golaszewski , Luiz Augusto von Dentz , Sasha Levin Subject: [PATCH 6.19 472/844] Bluetooth: hci_qca: Cleanup on all setup failures Date: Sat, 28 Feb 2026 12:26:25 -0500 Message-ID: <20260228173244.1509663-473-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260228173244.1509663-1-sashal@kernel.org> References: <20260228173244.1509663-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Jinwang Li [ 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 Reviewed-by: Bartosz Golaszewski Signed-off-by: Luiz Augusto von Dentz Signed-off-by: Sasha Levin --- 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 a3c217571c3c4..c0cc04995fc2f 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.51.0