Skip to content

Commit

Permalink
Bluetooth: btusb: Fix atheros firmware download error
Browse files Browse the repository at this point in the history
Move usb_autopm_get_interface() ahead of setup_on_usb() to prevent
device from sending usb control message in usb suspend mode.

The error message is as below:

[   83.944103] btusb 1-2:1.1: usb_suspend_interface: status 0
[   83.944107] btusb 1-2:1.0: usb_suspend_interface: status 0
[   83.960132] usb 1-2: usb auto-suspend, wakeup 0
[   83.976156] usb 1-2: usb_suspend_device: status 0
[   83.976162] usb 1-2: usb_suspend_both: status 0
[  298.689106] Bluetooth: hci0
[  298.689399] Bluetooth: hci0: Failed to access otp area (-113)

Signed-off-by: Ethan Hsieh <ethan.hsieh@canonical.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
  • Loading branch information
Ethan Hsieh authored and Marcel Holtmann committed Oct 7, 2016
1 parent 1b42206 commit c7e163f
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/bluetooth/btusb.c
Original file line number Diff line number Diff line change
@@ -1043,6 +1043,10 @@ static int btusb_open(struct hci_dev *hdev)

BT_DBG("%s", hdev->name);

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

/* Patching USB firmware files prior to starting any URBs of HCI path
* It is more safe to use USB bulk channel for downloading USB patch
*/
@@ -1052,10 +1056,6 @@ static int btusb_open(struct hci_dev *hdev)
return err;
}

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

data->intf->needs_remote_wakeup = 1;

if (test_and_set_bit(BTUSB_INTR_RUNNING, &data->flags))

0 comments on commit c7e163f

Please sign in to comment.