Commit 7bd9fb05 authored by Hui Wang's avatar Hui Wang Committed by Marcel Holtmann

Bluetooth: btusb: Fix the autosuspend enable and disable

I tried to disable the autosuspend on btusb through the module
parameter enable_autosuspend, this parameter is set to N, but the usb
bluetooth device is still runtime suspended.
$ cat /sys/module/btusb/parameters/enable_autosuspend
N
$ cat /sys/bus/usb/devices/3-10/power/runtime_status
suspended
$ cat /sys/bus/usb/devices/3-10/power/runtime_suspended_time
65187

We already set ".supports_autosuspend = 1" in the usb_driver, this
device will be set autosuspend enabled by usb core, we don't need
to call usb_enable_autosuspend() in the btusb_probe(). Instead if
users set the parameter enable_autosuspend to N, we need to call
usb_disable_autosuspend() in the btusb_probe(). After this change
and set the parameter to N, we could see the device is not runtime
suspended anymore.
$ cat /sys/module/btusb/parameters/enable_autosuspend
N
$ cat /sys/bus/usb/devices/3-10/power/runtime_status
active
$ cat /sys/bus/usb/devices/3-10/power/runtime_suspended_time
0

And if we disable the autosuspend in the btusb_probe(), we need to
enable the autosuspend in the disconnect(), this could guarantee
that the device could be runtime suspended after we rmmod the btusb.
Signed-off-by: default avatarHui Wang <hui.wang@canonical.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent b1810feb
...@@ -4840,8 +4840,8 @@ static int btusb_probe(struct usb_interface *intf, ...@@ -4840,8 +4840,8 @@ static int btusb_probe(struct usb_interface *intf,
data->diag = NULL; data->diag = NULL;
} }
if (enable_autosuspend) if (!enable_autosuspend)
usb_enable_autosuspend(data->udev); usb_disable_autosuspend(data->udev);
err = hci_register_dev(hdev); err = hci_register_dev(hdev);
if (err < 0) if (err < 0)
...@@ -4901,6 +4901,9 @@ static void btusb_disconnect(struct usb_interface *intf) ...@@ -4901,6 +4901,9 @@ 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