--- /dev/null
+From fd865802c66bc451dc515ed89360f84376ce1a56 Mon Sep 17 00:00:00 2001
+From: Leif Liddy <leif.linux@gmail.com>
+Date: Sat, 8 Jul 2017 20:55:32 +0200
+Subject: Bluetooth: btusb: fix QCA Rome suspend/resume
+
+From: Leif Liddy <leif.linux@gmail.com>
+
+commit fd865802c66bc451dc515ed89360f84376ce1a56 upstream.
+
+There's been numerous reported instances where BTUSB_QCA_ROME
+bluetooth controllers stop functioning upon resume from suspend. These
+devices seem to be losing power during suspend. Patch will detect a status
+change on resume and perform a reset.
+
+Signed-off-by: Leif Liddy <leif.linux@gmail.com>
+Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
+Cc: Kai Heng Feng <kai.heng.feng@canonical.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/bluetooth/btusb.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/drivers/bluetooth/btusb.c
++++ b/drivers/bluetooth/btusb.c
+@@ -3068,6 +3068,12 @@ static int btusb_probe(struct usb_interf
+ 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