[PATCH] Bluetooth: btmtk: delay usb_autopm_put_interface until WMT event received

[Paul Menzel]

Dear Sean, dear Yake,


Thank you for the patch.

Am 12.03.25 um 00:16 schrieb sean.wang at kernel.org:
> From: Sean Wang <sean.wang at mediatek.com>
> 
> Delay calling usb_autopm_put_interface until the WMT event response is
> received to ensure proper synchronization and prevent premature power
> management actions.

Do you have a reproducer? It’d be great if you could add that to the 
commit message.


Kind regards,

Paul


> Co-developed-by: Yake Yang <yake.yang at mediatek.com>
> Signed-off-by: Yake Yang <yake.yang at mediatek.com>
> Signed-off-by: Sean Wang <sean.wang at mediatek.com>
> ---
>   drivers/bluetooth/btmtk.c | 15 +++++++--------
>   1 file changed, 7 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/bluetooth/btmtk.c b/drivers/bluetooth/btmtk.c
> index 68846c5bd4f7..01832bc6a259 100644
> --- a/drivers/bluetooth/btmtk.c
> +++ b/drivers/bluetooth/btmtk.c
> @@ -620,17 +620,14 @@ static int btmtk_usb_hci_wmt_sync(struct hci_dev *hdev,
>   
>   	if (err < 0) {
>   		clear_bit(BTMTK_TX_WAIT_VND_EVT, &data->flags);
> -		usb_autopm_put_interface(data->intf);
> -		goto err_free_wc;
> +		goto err_pm_put;
>   	}
>   
>   	/* Submit control IN URB on demand to process the WMT event */
>   	err = btmtk_usb_submit_wmt_recv_urb(hdev);
>   
> -	usb_autopm_put_interface(data->intf);
> -
>   	if (err < 0)
> -		goto err_free_wc;
> +		goto err_pm_put;
>   
>   	/* The vendor specific WMT commands are all answered by a vendor
>   	 * specific event and will have the Command Status or Command
> @@ -646,18 +643,18 @@ static int btmtk_usb_hci_wmt_sync(struct hci_dev *hdev,
>   	if (err == -EINTR) {
>   		bt_dev_err(hdev, "Execution of wmt command interrupted");
>   		clear_bit(BTMTK_TX_WAIT_VND_EVT, &data->flags);
> -		goto err_free_wc;
> +		goto err_pm_put;
>   	}
>   
>   	if (err) {
>   		bt_dev_err(hdev, "Execution of wmt command timed out");
>   		clear_bit(BTMTK_TX_WAIT_VND_EVT, &data->flags);
>   		err = -ETIMEDOUT;
> -		goto err_free_wc;
> +		goto err_pm_put;
>   	}
>   
>   	if (data->evt_skb == NULL)
> -		goto err_free_wc;
> +		goto err_pm_put;
>   
>   	/* Parse and handle the return WMT event */
>   	wmt_evt = (struct btmtk_hci_wmt_evt *)data->evt_skb->data;
> @@ -700,6 +697,8 @@ static int btmtk_usb_hci_wmt_sync(struct hci_dev *hdev,
>   err_free_skb:
>   	kfree_skb(data->evt_skb);
>   	data->evt_skb = NULL;
> +err_pm_put:
> +	usb_autopm_put_interface(data->intf);
>   err_free_wc:
>   	kfree(wc);
>   	return err;