Bluetooth: btusb: mediatek: move Bluetooth power off command position

ChrisCH-Lu · gregkh · commit b967b37cefdf · 2025-01-02T10:34:25.000+01:00
commit ad0c6f6 upstream. Move MediaTek Bluetooth power off command before releasing usb ISO interface. Signed-off-by: Chris Lu <chris.lu@mediatek.com> Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> Cc: Fedor Pchelkin <boddah8794@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
@@ -2734,11 +2734,14 @@ static int btusb_mtk_shutdown(struct hci_dev *hdev)
 {
 	struct btusb_data *data = hci_get_drvdata(hdev);
 	struct btmtk_data *btmtk_data = hci_get_priv(hdev);
+	int ret;
+
+	ret = btmtk_usb_shutdown(hdev);
 
 	if (test_bit(BTMTK_ISOPKT_RUNNING, &btmtk_data->flags))
 		btusb_mtk_release_iso_intf(data);
 
-	return btmtk_usb_shutdown(hdev);
+	return ret;
 }
 
 #ifdef CONFIG_PM

Original file line number	Diff line number	Diff line change
`@@ -2734,11 +2734,14 @@ static int btusb_mtk_shutdown(struct hci_dev *hdev)`
`2734`	`2734`	`{`
`2735`	`2735`	`struct btusb_data *data = hci_get_drvdata(hdev);`
`2736`	`2736`	`struct btmtk_data *btmtk_data = hci_get_priv(hdev);`
	`2737`	`+ int ret;`
	`2738`	`+`
	`2739`	`+ ret = btmtk_usb_shutdown(hdev);`
`2737`	`2740`
`2738`	`2741`	`if (test_bit(BTMTK_ISOPKT_RUNNING, &btmtk_data->flags))`
`2739`	`2742`	`btusb_mtk_release_iso_intf(data);`
`2740`	`2743`
`2741`		`- return btmtk_usb_shutdown(hdev);`
	`2744`	`+ return ret;`
`2742`	`2745`	`}`
`2743`	`2746`
`2744`	`2747`	`#ifdef CONFIG_PM`