| From 7db920f717539237ba4b662ee9faf06d8817bf61 Mon Sep 17 00:00:00 2001 |
| From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Date: Fri, 22 Dec 2017 08:43:23 +0100 |
| Subject: Revert "Bluetooth: btusb: driver to enable the usb-wakeup feature" |
| |
| From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| This reverts commit 7336f5481f6cf913a2d29d98c6e11f4bbe19d3b2 which is |
| commit a0085f2510e8976614ad8f766b209448b385492f upstream. |
| |
| It causes problems with working systems, as noted by a number of the |
| ChromeOS developers. |
| |
| Cc: Sukumar Ghorai <sukumar.ghorai@intel.com> |
| Cc: Amit K Bag <amit.k.bag@intel.com> |
| Cc: Oliver Neukum <oneukum@suse.com> |
| Cc: Marcel Holtmann <marcel@holtmann.org> |
| Cc: Matthias Kaehlcke <mka@chromium.org> |
| Reported-by: Guenter Roeck <linux@roeck-us.net> |
| Reported-by: Brian Norris <briannorris@chromium.org> |
| Acked-by: Brian Norris <briannorris@chromium.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/bluetooth/btusb.c | 5 ----- |
| 1 file changed, 5 deletions(-) |
| |
| --- a/drivers/bluetooth/btusb.c |
| +++ b/drivers/bluetooth/btusb.c |
| @@ -1059,10 +1059,6 @@ static int btusb_open(struct hci_dev *hd |
| } |
| |
| 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; |
| @@ -1126,7 +1122,6 @@ static int btusb_close(struct hci_dev *h |
| goto failed; |
| |
| data->intf->needs_remote_wakeup = 0; |
| - device_wakeup_disable(&data->udev->dev); |
| usb_autopm_put_interface(data->intf); |
| |
| failed: |
