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

commit ad0c6f603bb0b07846fda484c59a176a8cd02838 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
index 11755cb1eb1635921eb06d1cdf61a9bf2cd7e0d9..b39e10b9addd29aed6284ff30351cecb305c2376 100644 (file)
--- 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