4.4-stable patches

added patches:
	revert-bluetooth-btusb-fix-quirk-for-atheros-1525-qca6174.patch

diff --git a/queue-4.4/revert-bluetooth-btusb-fix-quirk-for-atheros-1525-qca6174.patch b/queue-4.4/revert-bluetooth-btusb-fix-quirk-for-atheros-1525-qca6174.patch
new file mode 100644 (file)
index 0000000..15ade55
--- /dev/null
+++ b/queue-4.4/revert-bluetooth-btusb-fix-quirk-for-atheros-1525-qca6174.patch
@@ -0,0 +1,44 @@
+From 544a591668813583021474fa5c7ff4942244d654 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Thu, 26 Apr 2018 14:18:19 +0200
+Subject: Revert "Bluetooth: btusb: Fix quirk for Atheros 1525/QCA6174"
+
+From: Hans de Goede <hdegoede@redhat.com>
+
+commit 544a591668813583021474fa5c7ff4942244d654 upstream.
+
+Commit f44cb4b19ed4 ("Bluetooth: btusb: Fix quirk for Atheros
+1525/QCA6174") is causing bluetooth to no longer work for several
+people, see: https://bugzilla.redhat.com/show_bug.cgi?id=1568911
+
+So lets revert it for now and try to find another solution for
+devices which need the modified quirk.
+
+Cc: stable@vger.kernel.org
+Cc: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/bluetooth/btusb.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/bluetooth/btusb.c
++++ b/drivers/bluetooth/btusb.c
+@@ -216,6 +216,7 @@ static const struct usb_device_id blackl
+       { USB_DEVICE(0x0930, 0x0227), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0b05, 0x17d0), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0cf3, 0x0036), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0cf3, 0x3008), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0cf3, 0x311d), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0cf3, 0x311e), .driver_info = BTUSB_ATH3012 },
+@@ -246,7 +247,6 @@ static const struct usb_device_id blackl
+       { USB_DEVICE(0x0489, 0xe03c), .driver_info = BTUSB_ATH3012 },
+ 
+       /* QCA ROME chipset */
+-      { USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_QCA_ROME },
+       { USB_DEVICE(0x0cf3, 0xe007), .driver_info = BTUSB_QCA_ROME },
+       { USB_DEVICE(0x0cf3, 0xe300), .driver_info = BTUSB_QCA_ROME },
+       { USB_DEVICE(0x0cf3, 0xe360), .driver_info = BTUSB_QCA_ROME },

diff --git a/queue-4.4/series b/queue-4.4/series
index 23443b948cedd4fb48776ea54e84f53f0a93f84f..6035601ac257f447cb18b3a55cfbbd8f256cda5a 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -48,3 +48,4 @@ tracing-fix-regex_match_front-to-not-over-compare-the-test-string.patch
 can-kvaser_usb-increase-correct-stats-counter-in-kvaser_usb_rx_can_msg.patch
 net-atm-fix-potential-spectre-v1.patch
 atm-zatm-fix-potential-spectre-v1.patch
+revert-bluetooth-btusb-fix-quirk-for-atheros-1525-qca6174.patch