Skip to content

Commit

Permalink
Bluetooth: Remove the cmd timeout count in btusb
Browse files Browse the repository at this point in the history
Remove the cmd timeout count in btusb since we only ever allow one
command in flight at a time. We should always reset after a single
command times out.

Signed-off-by: Hsin-chen Chuang <chharry@chromium.org>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
  • Loading branch information
Hsin-chen Chuang authored and Luiz Augusto von Dentz committed Jan 15, 2025
1 parent acdbea5 commit 7c39342
Showing 1 changed file with 0 additions and 10 deletions.
10 changes: 0 additions & 10 deletions drivers/bluetooth/btusb.c
Original file line number Diff line number Diff line change
Expand Up @@ -890,7 +890,6 @@ struct btusb_data {
int (*disconnect)(struct hci_dev *hdev);

int oob_wake_irq; /* irq for out-of-band wake-on-bt */
unsigned cmd_timeout_cnt;

struct qca_dump_info qca_dump;
};
Expand Down Expand Up @@ -923,9 +922,6 @@ static void btusb_intel_cmd_timeout(struct hci_dev *hdev)
struct gpio_desc *reset_gpio = data->reset_gpio;
struct btintel_data *intel_data = hci_get_priv(hdev);

if (++data->cmd_timeout_cnt < 5)
return;

if (intel_data->acpi_reset_method) {
if (test_and_set_bit(INTEL_ACPI_RESET_ACTIVE, intel_data->flags)) {
bt_dev_err(hdev, "acpi: last reset failed ? Not resetting again");
Expand Down Expand Up @@ -1008,9 +1004,6 @@ static void btusb_rtl_cmd_timeout(struct hci_dev *hdev)

btusb_rtl_alloc_devcoredump(hdev, &hdr, NULL, 0);

if (++data->cmd_timeout_cnt < 5)
return;

if (!reset_gpio) {
btusb_reset(hdev);
return;
Expand Down Expand Up @@ -1055,9 +1048,6 @@ static void btusb_qca_cmd_timeout(struct hci_dev *hdev)
return;
}

if (++data->cmd_timeout_cnt < 5)
return;

if (reset_gpio) {
bt_dev_err(hdev, "Reset qca device via bt_en gpio");

Expand Down

0 comments on commit 7c39342

Please sign in to comment.