From: Greg Kroah-Hartman Date: Sat, 12 May 2018 19:28:12 +0000 (+0200) Subject: 4.4-stable patches X-Git-Tag: v3.18.109~18 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=74925bc482eebe665e2e585e0e02d040ee788f39;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index 00000000000..15ade55d382 --- /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 +Date: Thu, 26 Apr 2018 14:18:19 +0200 +Subject: Revert "Bluetooth: btusb: Fix quirk for Atheros 1525/QCA6174" + +From: Hans de Goede + +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 +Signed-off-by: Hans de Goede +Signed-off-by: Marcel Holtmann +Signed-off-by: Greg Kroah-Hartman + +--- + 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 23443b948ce..6035601ac25 100644 --- 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