Commit 7b491f24 authored by Lu Baolu's avatar Lu Baolu Committed by Luis Henriques

Revert "xhci: clear root port wake on bits if controller isn't wake-up capable"

commit 9b41ebd3 upstream.

commit ff8cbf25 ("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: default avatarLu Baolu <baolu.lu@linux.intel.com>
Reported-by: default avatarDmitry Nezhevenko <dion@inhex.net>
[Mathias Nyman: reword commit message]
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent 2bb2d9b9
......@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment