Commit 89591522 authored by Hans de Goede's avatar Hans de Goede Committed by Linus Torvalds

Bluetooth: btusb: Revert Fix the autosuspend enable and disable

drivers/usb/core/hub.c: usb_new_device() contains the following:

        /* By default, forbid autosuspend for all devices.  It will be
         * allowed for hubs during binding.
         */
        usb_disable_autosuspend(udev);

So for anything which is not a hub, such as btusb devices, autosuspend is
disabled by default and we must call usb_enable_autosuspend(udev) to
enable it.

This means that the "Fix the autosuspend enable and disable" commit,
which drops the usb_enable_autosuspend() call when the enable_autosuspend
module option is true, is completely wrong, revert it.

This reverts commit 7bd9fb05.

Cc: Hui Wang <hui.wang@canonical.com>
Fixes: 7bd9fb05 ("Bluetooth: btusb: Fix the autosuspend enable and disable")
Acked-by: default avatarHui Wang <hui.wang@canonical.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 17e7124a
...@@ -4849,8 +4849,8 @@ static int btusb_probe(struct usb_interface *intf, ...@@ -4849,8 +4849,8 @@ static int btusb_probe(struct usb_interface *intf,
data->diag = NULL; data->diag = NULL;
} }
if (!enable_autosuspend) if (enable_autosuspend)
usb_disable_autosuspend(data->udev); usb_enable_autosuspend(data->udev);
err = hci_register_dev(hdev); err = hci_register_dev(hdev);
if (err < 0) if (err < 0)
...@@ -4910,9 +4910,6 @@ static void btusb_disconnect(struct usb_interface *intf) ...@@ -4910,9 +4910,6 @@ static void btusb_disconnect(struct usb_interface *intf)
gpiod_put(data->reset_gpio); gpiod_put(data->reset_gpio);
hci_free_dev(hdev); hci_free_dev(hdev);
if (!enable_autosuspend)
usb_enable_autosuspend(data->udev);
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment