Home Home > GIT Browse > stable
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2019-06-18 15:26:01 +0200
committerJiri Slaby <jslaby@suse.cz>2019-06-18 15:26:01 +0200
commit40407118a133f416aff17f80e864838307f89ca5 (patch)
treeb335fcd3c3ecc8b0d4352b45e7c65f1215825807
parentfa73bae5016f7e3e9773bdc8a270032c65175124 (diff)
parentb043955cd896da0a57df8d1aa0e5e9f7e941f5f3 (diff)
Merge remote-tracking branch 'origin/users/msuchanek/stable/for-next' into stablestable
-rw-r--r--patches.suse/Revert-Bluetooth-btusb-driver-to-enable-the-usb-wake.patch42
-rw-r--r--series.conf2
2 files changed, 44 insertions, 0 deletions
diff --git a/patches.suse/Revert-Bluetooth-btusb-driver-to-enable-the-usb-wake.patch b/patches.suse/Revert-Bluetooth-btusb-driver-to-enable-the-usb-wake.patch
new file mode 100644
index 0000000000..5a92364808
--- /dev/null
+++ b/patches.suse/Revert-Bluetooth-btusb-driver-to-enable-the-usb-wake.patch
@@ -0,0 +1,42 @@
+From 2292984907bdca09396f25c90bc1d30478d34fd5 Mon Sep 17 00:00:00 2001
+From: Michal Suchanek <msuchanek@suse.de>
+Date: Tue, 26 Mar 2019 22:37:42 +0100
+Subject: [PATCH] Revert "Bluetooth: btusb: driver to enable the usb-wakeup
+ feature"
+
+Patch-mainline: no, testing
+References: boo#1130448
+
+This reverts commit a0085f2510e8976614ad8f766b209448b385492f.
+
+Signed-off-by: Michal Suchanek <msuchanek@suse.de>
+---
+ drivers/bluetooth/btusb.c | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
+index 4761499db9ee..6d35cdb99c5e 100644
+--- a/drivers/bluetooth/btusb.c
++++ b/drivers/bluetooth/btusb.c
+@@ -1138,10 +1138,6 @@ static int btusb_open(struct hci_dev *hdev)
+ }
+
+ data->intf->needs_remote_wakeup = 1;
+- /* device specific wakeup source enabled and required for USB
+- * remote wakeup while host is suspended
+- */
+- device_wakeup_enable(&data->udev->dev);
+
+ if (test_and_set_bit(BTUSB_INTR_RUNNING, &data->flags))
+ goto done;
+@@ -1205,7 +1201,6 @@ static int btusb_close(struct hci_dev *hdev)
+ goto failed;
+
+ data->intf->needs_remote_wakeup = 0;
+- device_wakeup_disable(&data->udev->dev);
+ usb_autopm_put_interface(data->intf);
+
+ failed:
+--
+2.20.1
+
diff --git a/series.conf b/series.conf
index fad329ace4..f8f80a4340 100644
--- a/series.conf
+++ b/series.conf
@@ -1442,6 +1442,8 @@
# USB
########################################################
+ patches.suse/Revert-Bluetooth-btusb-driver-to-enable-the-usb-wake.patch
+
########################################################
# I2C
########################################################