diff options
| author | Lu Baolu <baolu.lu@linux.intel.com> | 2014-11-18 12:27:13 +0300 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2014-12-14 19:23:59 +0300 |
| commit | fcd751b7ecdf627a0279f753f21ba7e39f1a7d46 (patch) | |
| tree | 2c13d1cfad789c94313df02bf22af6959a2a1653 | |
| parent | aba14f8ea6cb108e0ed1e938f24d26cd29bd02b4 (diff) | |
| download | linux-fcd751b7ecdf627a0279f753f21ba7e39f1a7d46.tar.xz | |
Revert "xhci: clear root port wake on bits if controller isn't wake-up capable"
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>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | drivers/usb/host/xhci-hub.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c index a3b569f173c3..a8bbeed66581 100644 --- a/drivers/usb/host/xhci-hub.c +++ b/drivers/usb/host/xhci-hub.c @@ -21,7 +21,6 @@ */ #include <linux/gfp.h> -#include <linux/device.h> #include <asm/unaligned.h> #include "xhci.h" @@ -996,9 +995,7 @@ int xhci_bus_suspend(struct usb_hcd *hcd) t2 |= PORT_LINK_STROBE | XDEV_U3; set_bit(port_index, &bus_state->bus_suspended); } - 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; |