summaryrefslogtreecommitdiff
path: root/libre/linux-libre-grsec/0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch
diff options
context:
space:
mode:
authorshackra <elcorreo@deshackra.com>2014-04-23 16:03:40 -0600
committershackra <elcorreo@deshackra.com>2014-04-23 16:03:40 -0600
commit2702acf6a54c50b53011754092d3cdaaaea0714c (patch)
tree2ce147829c38e58908e55a6078af7c4a88db7412 /libre/linux-libre-grsec/0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch
parent4721cc690d3f77c5380943f1788511fa900f2317 (diff)
Merge branch 'master' of ssh://projects.parabolagnulinux.org:1863/srv/git/abslibre
# Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit. Signed-off-by: shackra <elcorreo@deshackra.com>
Diffstat (limited to 'libre/linux-libre-grsec/0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch')
-rw-r--r--libre/linux-libre-grsec/0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/libre/linux-libre-grsec/0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch b/libre/linux-libre-grsec/0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch
new file mode 100644
index 000000000..74283b57c
--- /dev/null
+++ b/libre/linux-libre-grsec/0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch
@@ -0,0 +1,33 @@
+From 71d4f3022d1f625d94187f7cda682d2233a692d8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas@archlinux.org>
+Date: Thu, 3 Apr 2014 23:59:49 +0200
+Subject: [PATCH 05/10] Revert "Bluetooth: Enable autosuspend for Intel
+ Bluetooth device"
+
+This reverts commit d2bee8fb6e18f6116aada39851918473761f7ab1.
+
+USB autosuspend still breaks on some xhci controllers, so disable
+it by default as long as no solution is found.
+---
+ drivers/bluetooth/btusb.c | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
+index baeaaed..6d6e09e 100644
+--- a/drivers/bluetooth/btusb.c
++++ b/drivers/bluetooth/btusb.c
+@@ -1478,10 +1478,8 @@ static int btusb_probe(struct usb_interface *intf,
+ if (id->driver_info & BTUSB_BCM92035)
+ hdev->setup = btusb_setup_bcm92035;
+
+- if (id->driver_info & BTUSB_INTEL) {
+- usb_enable_autosuspend(data->udev);
++ if (id->driver_info & BTUSB_INTEL)
+ hdev->setup = btusb_setup_intel;
+- }
+
+ /* Interface numbers are hardcoded in the specification */
+ data->isoc = usb_ifnum_to_if(data->udev, 1);
+--
+1.9.2
+