diff options
| author | Kai-Heng Feng <kai.heng.feng@canonical.com> | 2017-09-18 17:39:19 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-10-12 11:51:18 +0200 |
| commit | a13481f8cdca4e3f08d950e230f49742d95fc70c (patch) | |
| tree | 22d525fe6638eb28b0807662a62692367f1e1d8b /drivers/usb/host/xhci-hub.c | |
| parent | f77615db8ae850ef196843502b1d0aaae8e173d2 (diff) | |
| download | linux-stable-a13481f8cdca4e3f08d950e230f49742d95fc70c.tar.gz linux-stable-a13481f8cdca4e3f08d950e230f49742d95fc70c.tar.bz2 linux-stable-a13481f8cdca4e3f08d950e230f49742d95fc70c.zip | |
Revert "xhci: Limit USB2 port wake support for AMD Promontory hosts"
commit bcd6a7aa13800afc1418e6b29d944d882214939a upstream.
This reverts commit dec08194ffeccfa1cf085906b53d301930eae18f.
Commit dec08194ffec ("xhci: Limit USB2 port wake support for AMD Promontory
hosts") makes all high speed USB ports on ASUS PRIME B350M-A cease to
function after enabling runtime PM.
All boards with this chipsets will be affected, so revert the commit.
The original patch was added to stable 4.9, 4.11 and 4.12 and needs
to reverted from there as well
Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host/xhci-hub.c')
| -rw-r--r-- | drivers/usb/host/xhci-hub.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c index eb4312b12215..4a02c5c7df0d 100644 --- a/drivers/usb/host/xhci-hub.c +++ b/drivers/usb/host/xhci-hub.c @@ -1360,9 +1360,6 @@ int xhci_bus_suspend(struct usb_hcd *hcd) t2 |= PORT_WKOC_E | PORT_WKCONN_E; t2 &= ~PORT_WKDISC_E; } - if ((xhci->quirks & XHCI_U2_DISABLE_WAKE) && - (hcd->speed < HCD_USB3)) - t2 &= ~PORT_WAKE_BITS; } else t2 &= ~PORT_WAKE_BITS; |