| From 9b41ebd3cf0f68d8cad779d3eeba336f78262e43 Mon Sep 17 00:00:00 2001 |
| From: Lu Baolu <baolu.lu@linux.intel.com> |
| Date: Tue, 18 Nov 2014 11:27:13 +0200 |
| Subject: Revert "xhci: clear root port wake on bits if controller isn't wake-up capable" |
| |
| From: Lu Baolu <baolu.lu@linux.intel.com> |
| |
| commit 9b41ebd3cf0f68d8cad779d3eeba336f78262e43 upstream. |
| |
| commit ff8cbf250b44 ("xhci: clear root port wake on bits if controller isn't") |
| can cause device detection error if runtime PM is enabled, and S3 wake |
| is disabled. Revert it. |
| https://bugzilla.kernel.org/show_bug.cgi?id=85701 |
| |
| This commit got into stable and should be reverted from there as well. |
| |
| Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com> |
| Reported-by: Dmitry Nezhevenko <dion@inhex.net> |
| [Mathias Nyman: reword commit message] |
| Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/usb/host/xhci-hub.c | 5 +---- |
| 1 file changed, 1 insertion(+), 4 deletions(-) |
| |
| --- a/drivers/usb/host/xhci-hub.c |
| +++ b/drivers/usb/host/xhci-hub.c |
| @@ -22,7 +22,6 @@ |
| |
| |
| #include <linux/slab.h> |
| -#include <linux/device.h> |
| #include <asm/unaligned.h> |
| |
| #include "xhci.h" |
| @@ -1142,9 +1141,7 @@ int xhci_bus_suspend(struct usb_hcd *hcd |
| * including the USB 3.0 roothub, but only if CONFIG_PM_RUNTIME |
| * is enabled, so also enable remote wake here. |
| */ |
| - if (hcd->self.root_hub->do_remote_wakeup |
| - && device_may_wakeup(hcd->self.controller)) { |
| - |
| + if (hcd->self.root_hub->do_remote_wakeup) { |
| if (t1 & PORT_CONNECT) { |
| t2 |= PORT_WKOC_E | PORT_WKDISC_E; |
| t2 &= ~PORT_WKCONN_E; |
