Commit 8ae22de9 authored by Douglas Anderson's avatar Douglas Anderson Committed by Luiz Augusto von Dentz
Browse files

Bluetooth: qca: If memdump doesn't work, re-enable IBS 



On systems in the field, we are seeing this sometimes in the kernel logs:
  Bluetooth: qca_controller_memdump() hci0: hci_devcd_init Return:-95

This means that _something_ decided that it wanted to get a memdump
but then hci_devcd_init() returned -EOPNOTSUPP (AKA -95).

The cleanup code in qca_controller_memdump() when we get back an error
from hci_devcd_init() undoes most things but forgets to clear
QCA_IBS_DISABLED. One side effect of this is that, during the next
suspend, qca_suspend() will always get a timeout.

Let's fix it so that we clear the bit.

Fixes: 06d3fdfc ("Bluetooth: hci_qca: Add qcom devcoredump support")
Reviewed-by: default avatarGuenter Roeck <groeck@chromium.org>
Reviewed-by: default avatarStephen Boyd <swboyd@chromium.org>
Signed-off-by: default avatarDouglas Anderson <dianders@chromium.org>
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
parent fe1910f9

drivers/bluetooth/hci_qca.c

+1 −0
Original line number Diff line number Diff line
@@ -1091,6 +1091,7 @@ static void qca_controller_memdump(struct work_struct *work) 
				qca->memdump_state = QCA_MEMDUMP_COLLECTED;

				cancel_delayed_work(&qca->ctrl_memdump_timeout);

				clear_bit(QCA_MEMDUMP_COLLECTION, &qca->flags);

				clear_bit(QCA_IBS_DISABLED, &qca->flags);

				mutex_unlock(&qca->hci_memdump_lock);

				return;

			}