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
commit 1bb0c66 upstream.

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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Venkata Lakshmi Narayana Gubba authored and Greg Kroah-Hartman committed Jan 24, 2023
1 parent ef11bc4 commit c208f1e
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/bluetooth/hci_qca.c
Original file line number Diff line number Diff line change
@@ -2120,7 +2120,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;

0 comments on commit c208f1e

Please sign in to comment.