Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d06d589 authored by Kai-Heng Feng's avatar Kai-Heng Feng Committed by Marcel Holtmann
Browse files

Revert "Bluetooth: btusb: fix QCA Rome suspend/resume" 



This reverts commit fd865802.

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
("a0085f25 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: default avatarKai-Heng Feng <kai.heng.feng@canonical.com>
Reviewed-by: default avatarBrian Norris <briannorris@chromium.org>
Tested-by: default avatarBrian Norris <briannorris@chromium.org>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 43fff768

drivers/bluetooth/btusb.c

+0 −6
Original line number Diff line number Diff line
@@ -3119,12 +3119,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