| Message ID | 20180201050654.13545-2-kai.heng.feng@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [SRU,Bionic,1/2] Revert "Bluetooth: btusb: fix QCA Rome suspend/resume" | expand |
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 5f37d7213c4d..789efae7e568 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -3100,12 +3100,6 @@ static int btusb_probe(struct usb_interface *intf, if (id->driver_info & BTUSB_QCA_ROME) { data->setup_on_usb = btusb_setup_qca; hdev->set_bdaddr = btusb_set_bdaddr_ath3012; - - /* QCA Rome devices lose their updated firmware over suspend, - * but the USB hub doesn't notice any status change. - * Explicitly request a device reset on resume. - */ - set_bit(BTUSB_RESET_RESUME, &data->flags); } #ifdef CONFIG_BT_HCIBTUSB_RTL
BugLink: https://bugs.launchpad.net/bugs/1744712 This reverts commit fd865802c66bc451dc515ed89360f84376ce1a56. This commit causes a regression on some QCA ROME chips. The USB device reset happens in btusb_open(), hence firmware loading gets interrupted. Furthermore, this commit stops working after commit ("a0085f2510e8976614ad8f766b209448b385492f Bluetooth: btusb: driver to enable the usb-wakeup feature"). Reset-resume quirk only gets enabled in btusb_suspend() when it's not a wakeup source. If we really want to reset the USB device, we need to do it before btusb_open(). Let's handle it in drivers/usb/core/quirks.c. Cc: stable@vger.kernel.org Cc: Leif Liddy <leif.linux@gmail.com> Cc: Matthias Kaehlcke <mka@chromium.org> Cc: Brian Norris <briannorris@chromium.org> Cc: Daniel Drake <drake@endlessm.com> Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com> Reviewed-by: Brian Norris <briannorris@chromium.org> Tested-by: Brian Norris <briannorris@chromium.org> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> (cherry picked from commit 7d06d5895c159f64c46560dc258e553ad8670fe0) Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com> --- drivers/bluetooth/btusb.c | 6 ------ 1 file changed, 6 deletions(-)