Skip to content

Commit 67dba2c

Browse files
ChrisCH-LuVudentz
authored andcommitted
Bluetooth: btmtk: Fix failed to send func ctrl for MediaTek devices.
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: 5c5e8c5 ("Bluetooth: btmtk: move btusb_mtk_[setup, shutdown] to btmtk.c") Signed-off-by: Chris Lu <[email protected]> Signed-off-by: Luiz Augusto von Dentz <[email protected]>
1 parent 8023dd2 commit 67dba2c

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

drivers/bluetooth/btmtk.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1472,10 +1472,15 @@ EXPORT_SYMBOL_GPL(btmtk_usb_setup);
14721472

14731473
int btmtk_usb_shutdown(struct hci_dev *hdev)
14741474
{
1475+
struct btmtk_data *data = hci_get_priv(hdev);
14751476
struct btmtk_hci_wmt_params wmt_params;
14761477
u8 param = 0;
14771478
int err;
14781479

1480+
err = usb_autopm_get_interface(data->intf);
1481+
if (err < 0)
1482+
return err;
1483+
14791484
/* Disable the device */
14801485
wmt_params.op = BTMTK_WMT_FUNC_CTRL;
14811486
wmt_params.flag = 0;
@@ -1486,9 +1491,11 @@ int btmtk_usb_shutdown(struct hci_dev *hdev)
14861491
err = btmtk_usb_hci_wmt_sync(hdev, &wmt_params);
14871492
if (err < 0) {
14881493
bt_dev_err(hdev, "Failed to send wmt func ctrl (%d)", err);
1494+
usb_autopm_put_interface(data->intf);
14891495
return err;
14901496
}
14911497

1498+
usb_autopm_put_interface(data->intf);
14921499
return 0;
14931500
}
14941501
EXPORT_SYMBOL_GPL(btmtk_usb_shutdown);

net/bluetooth/rfcomm/tty.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,14 +201,14 @@ static ssize_t address_show(struct device *tty_dev,
201201
struct device_attribute *attr, char *buf)
202202
{
203203
struct rfcomm_dev *dev = dev_get_drvdata(tty_dev);
204-
return sprintf(buf, "%pMR\n", &dev->dst);
204+
return sysfs_emit(buf, "%pMR\n", &dev->dst);
205205
}
206206

207207
static ssize_t channel_show(struct device *tty_dev,
208208
struct device_attribute *attr, char *buf)
209209
{
210210
struct rfcomm_dev *dev = dev_get_drvdata(tty_dev);
211-
return sprintf(buf, "%d\n", dev->channel);
211+
return sysfs_emit(buf, "%d\n", dev->channel);
212212
}
213213

214214
static DEVICE_ATTR_RO(address);

0 commit comments

Comments
 (0)