From: Venkata Lakshmi Narayana Gubba Date: Tue, 2 Feb 2021 14:57:42 +0000 (+0530) Subject: Bluetooth: hci_qca: check for SSR triggered flag while suspend X-Git-Tag: io_uring-worker.v3-2021-02-25~99^2~74^2~11 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=1bb0c66332babc5cbc4581d962da0b03af9f23e8;p=linux-2.6-block.git Bluetooth: hci_qca: check for SSR triggered flag while suspend 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: 2be43abac5a8 ("Bluetooth: hci_qca: Wait for timeout during suspend") Signed-off-by: Venkata Lakshmi Narayana Gubba Signed-off-by: Marcel Holtmann --- diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c index 17a3859326dc..ff2fb68a45b1 100644 --- a/drivers/bluetooth/hci_qca.c +++ b/drivers/bluetooth/hci_qca.c @@ -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;