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>

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 145b3fbfff55036da3e2748f56a03471818a593a..90966dfbd2781f64a2babe0a6ba45543851950e5 100644 (file)
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -899,11 +899,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);