FROMGIT: Bluetooth: Fix possible infinite recursion of btusb_reset
The function enters infinite recursion if the HCI device doesn't support
GPIO reset: btusb_reset -> hdev->reset -> vendor_reset -> btusb_reset...
btusb_reset shouldn't call hdev->reset after commit f07d478090b0
("Bluetooth: Get rid of cmd_timeout and use the reset callback")
Fixes: f07d478090b0 ("Bluetooth: Get rid of cmd_timeout and use the reset callback")
Signed-off-by: Hsin-chen Chuang <chharry@chromium.org>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Bug: 376104075
(cherry picked from commit 9e2714de7384d2e318c9bb0d2570229dc415a22e
https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git master)
Change-Id: I2da8e86ec6ac5efe7dac04faced5f90cc086bd01
Signed-off-by: Hsin-chen Chuang <chharry@google.com>
This commit is contained in:
committed by
Neill Kapron
parent
e817de5d0b
commit
9400941ead
@@ -882,11 +882,6 @@ static void btusb_reset(struct hci_dev *hdev)
|
||||
struct btusb_data *data;
|
||||
int err;
|
||||
|
||||
if (hdev->reset) {
|
||||
hdev->reset(hdev);
|
||||
return;
|
||||
}
|
||||
|
||||
data = hci_get_drvdata(hdev);
|
||||
/* This is not an unbalanced PM reference since the device will reset */
|
||||
err = usb_autopm_get_interface(data->intf);
|
||||
|
||||
Reference in New Issue
Block a user