Skip to content

Commit

Permalink
Bluetooth: hci_qca: check for SSR triggered flag while suspend
Browse files Browse the repository at this point in the history
[ Upstream commit 1bb0c66 ]

QCA_IBS_DISABLED flag will be set after memorydump started from
controller.Currently qca_suspend() is waiting for SSR to complete
based on flag QCA_IBS_DISABLED.Added to check for QCA_SSR_TRIGGERED
flag too.

Fixes: 2be43ab ("Bluetooth: hci_qca: Wait for timeout during suspend")
Signed-off-by: Venkata Lakshmi Narayana Gubba <gubbaven@codeaurora.org>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Venkata Lakshmi Narayana Gubba authored and gregkh committed Mar 4, 2021
1 parent 78bd778 commit b9244c7
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/bluetooth/hci_qca.c
Expand Up @@ -2111,7 +2111,8 @@ static int __maybe_unused qca_suspend(struct device *dev)
!test_bit(QCA_SSR_TRIGGERED, &qca->flags))
return 0;

if (test_bit(QCA_IBS_DISABLED, &qca->flags)) {
if (test_bit(QCA_IBS_DISABLED, &qca->flags) ||
test_bit(QCA_SSR_TRIGGERED, &qca->flags)) {
wait_timeout = test_bit(QCA_SSR_TRIGGERED, &qca->flags) ?
IBS_DISABLE_SSR_TIMEOUT_MS :
FW_DOWNLOAD_TIMEOUT_MS;
Expand Down

0 comments on commit b9244c7

Please sign in to comment.