mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-22 07:53:11 -05:00
Code Activity

Bluetooth: btmtk: Fix failed to send func ctrl for MediaTek devices.

Browse source 
Use usb_autopm_get_interface() and usb_autopm_put_interface()
in btmtk_usb_shutdown(), it could send func ctrl after enabling
autosuspend.

Bluetooth: btmtk_usb_hci_wmt_sync() hci0: Execution of wmt command
           timed out
Bluetooth: btmtk_usb_shutdown() hci0: Failed to send wmt func ctrl
           (-110)

Fixes: 5c5e8c52e3 ("Bluetooth: btmtk: move btusb_mtk_[setup, shutdown] to btmtk.c")
Signed-off-by: Chris Lu <chris.lu@mediatek.com>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This commit is contained in:
Chris Lu 2025-01-08 17:50:28 +08:00 committed by Luiz Augusto von Dentz
parent 8023dd2204
commit 67dba2c28f
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/bluetooth/btmtk.c
View file

@ -1472,10 +1472,15 @@ EXPORT_SYMBOL_GPL(btmtk_usb_setup);
int btmtk_usb_shutdown(struct hci_dev *hdev) int btmtk_usb_shutdown(struct hci_dev *hdev)
{ {
struct btmtk_data *data = hci_get_priv(hdev);
struct btmtk_hci_wmt_params wmt_params; struct btmtk_hci_wmt_params wmt_params;
u8 param = 0; u8 param = 0;
int err; int err;
err = usb_autopm_get_interface(data->intf);
if (err < 0)
return err;
/* Disable the device */ /* Disable the device */
wmt_params.op = BTMTK_WMT_FUNC_CTRL; wmt_params.op = BTMTK_WMT_FUNC_CTRL;
wmt_params.flag = 0; wmt_params.flag = 0;
@ -1486,9 +1491,11 @@ int btmtk_usb_shutdown(struct hci_dev *hdev)
err = btmtk_usb_hci_wmt_sync(hdev, &wmt_params); err = btmtk_usb_hci_wmt_sync(hdev, &wmt_params);
if (err < 0) { if (err < 0) {
bt_dev_err(hdev, "Failed to send wmt func ctrl (%d)", err); bt_dev_err(hdev, "Failed to send wmt func ctrl (%d)", err);
usb_autopm_put_interface(data->intf);
return err; return err;
} }
usb_autopm_put_interface(data->intf);
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(btmtk_usb_shutdown); EXPORT_SYMBOL_GPL(btmtk_usb_shutdown);

4
net/bluetooth/rfcomm/tty.c
View file

@ -201,14 +201,14 @@ static ssize_t address_show(struct device *tty_dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct rfcomm_dev *dev = dev_get_drvdata(tty_dev); struct rfcomm_dev *dev = dev_get_drvdata(tty_dev);
return sprintf(buf, "%pMR\n", &dev->dst); return sysfs_emit(buf, "%pMR\n", &dev->dst);
} }
static ssize_t channel_show(struct device *tty_dev, static ssize_t channel_show(struct device *tty_dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct rfcomm_dev *dev = dev_get_drvdata(tty_dev); struct rfcomm_dev *dev = dev_get_drvdata(tty_dev);
return sprintf(buf, "%d\n", dev->channel); return sysfs_emit(buf, "%d\n", dev->channel);
} }
static DEVICE_ATTR_RO(address); static DEVICE_ATTR_RO(address);