From: Greg Kroah-Hartman Date: Wed, 16 May 2018 07:58:39 +0000 (+0200) Subject: fix up bluetooth patch in 4.14.y and 4.16.y X-Git-Tag: v3.18.109~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fbeb3ad3988dc01a84b7ed7ce3e416fde65a5b39;p=thirdparty%2Fkernel%2Fstable-queue.git fix up bluetooth patch in 4.14.y and 4.16.y --- diff --git a/queue-4.14/bluetooth-btusb-only-check-needs_reset_resume-dmi-table-for-qca-rome-chipsets.patch b/queue-4.14/bluetooth-btusb-only-check-needs_reset_resume-dmi-table-for-qca-rome-chipsets.patch index d21fa9ee15e..eec9db26e73 100644 --- a/queue-4.14/bluetooth-btusb-only-check-needs_reset_resume-dmi-table-for-qca-rome-chipsets.patch +++ b/queue-4.14/bluetooth-btusb-only-check-needs_reset_resume-dmi-table-for-qca-rome-chipsets.patch @@ -56,11 +56,11 @@ Signed-off-by: Greg Kroah-Hartman #ifdef CONFIG_PM err = btusb_config_oob_wake(hdev); if (err) -@@ -3177,6 +3180,7 @@ static int btusb_probe(struct usb_interf - hdev->setup = btusb_setup_csr; - - set_bit(HCI_QUIRK_SIMULTANEOUS_DISCOVERY, &hdev->quirks); +@@ -3126,6 +3129,7 @@ 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; + btusb_check_needs_reset_resume(intf); } - if (id->driver_info & BTUSB_SNIFFER) { + #ifdef CONFIG_BT_HCIBTUSB_RTL diff --git a/queue-4.16/bluetooth-btusb-only-check-needs_reset_resume-dmi-table-for-qca-rome-chipsets.patch b/queue-4.16/bluetooth-btusb-only-check-needs_reset_resume-dmi-table-for-qca-rome-chipsets.patch index 6b4bdefe81d..51e330d22e3 100644 --- a/queue-4.16/bluetooth-btusb-only-check-needs_reset_resume-dmi-table-for-qca-rome-chipsets.patch +++ b/queue-4.16/bluetooth-btusb-only-check-needs_reset_resume-dmi-table-for-qca-rome-chipsets.patch @@ -56,11 +56,11 @@ Signed-off-by: Greg Kroah-Hartman #ifdef CONFIG_PM err = btusb_config_oob_wake(hdev); if (err) -@@ -3109,6 +3112,7 @@ static int btusb_probe(struct usb_interf - hdev->setup = btusb_setup_csr; - - set_bit(HCI_QUIRK_SIMULTANEOUS_DISCOVERY, &hdev->quirks); +@@ -3057,6 +3060,7 @@ 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; + btusb_check_needs_reset_resume(intf); } - if (id->driver_info & BTUSB_SNIFFER) { + #ifdef CONFIG_BT_HCIBTUSB_RTL