diff options
| author | Venkata Lakshmi Narayana Gubba <gubbaven@codeaurora.org> | 2021-02-02 20:27:42 +0530 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2021-02-02 17:18:44 +0100 |
| commit | 1bb0c66332babc5cbc4581d962da0b03af9f23e8 (patch) | |
| tree | 1e25913ba411afdfc518ef3088de8446d6f76a2a /drivers/bluetooth/hci_qca.c | |
| parent | 8b1c324c9faeb3e159256df0b84f9251a7941a33 (diff) | |
| download | lwn-1bb0c66332babc5cbc4581d962da0b03af9f23e8.tar.gz lwn-1bb0c66332babc5cbc4581d962da0b03af9f23e8.zip | |
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 <gubbaven@codeaurora.org>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'drivers/bluetooth/hci_qca.c')
| -rw-r--r-- | drivers/bluetooth/hci_qca.c | 3 |
1 files changed, 2 insertions, 1 deletions
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; |