Skip to content

[Deepin-Kernel-SIG] [Upstream] [linux 6.6-y] Bluetooth: btmtk: Fix failed to send func ctrl for MediaTek devices. #575

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
opsiff merged 1 commit into from
Jan 23, 2025
Merged

[Deepin-Kernel-SIG] [Upstream] [linux 6.6-y] Bluetooth: btmtk: Fix failed to send func ctrl for MediaTek devices. #575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions drivers/bluetooth/btmtk.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1473,10 +1473,15 @@ EXPORT_SYMBOL_GPL(btmtk_usb_setup);

int btmtk_usb_shutdown(struct hci_dev *hdev)
{
struct btmtk_data *data = hci_get_priv(hdev);
struct btmtk_hci_wmt_params wmt_params;
u8 param = 0;
int err;

err = usb_autopm_get_interface(data->intf);
if (err < 0)
return err;

/* Disable the device */
wmt_params.op = BTMTK_WMT_FUNC_CTRL;
wmt_params.flag = 0;
Expand All @@ -1487,9 +1492,11 @@ int btmtk_usb_shutdown(struct hci_dev *hdev)
err = btmtk_usb_hci_wmt_sync(hdev, &wmt_params);
if (err < 0) {
bt_dev_err(hdev, "Failed to send wmt func ctrl (%d)", err);
usb_autopm_put_interface(data->intf);
return err;
}

usb_autopm_put_interface(data->intf);
return 0;
}
EXPORT_SYMBOL_GPL(btmtk_usb_shutdown);
Expand Down
4 changes: 2 additions & 2 deletions net/bluetooth/rfcomm/tty.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,14 +201,14 @@ static ssize_t address_show(struct device *tty_dev,
struct device_attribute *attr, char *buf)
{
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,
struct device_attribute *attr, char *buf)
{
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);
Expand Down
Loading