Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b41ebd3 authored by Lu Baolu's avatar Lu Baolu Committed by Greg Kroah-Hartman
Browse files

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

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.

Cc: stable <stable@vger.kernel.org> # v3.2+
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>
parent c3492dbf

drivers/usb/host/xhci-hub.c

+1 −4
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 




#include <linux/slab.h>

#include <linux/device.h>

#include <asm/unaligned.h>



#include "xhci.h"
@@ -1149,9 +1148,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;