Revert "xhci: clear root port wake on bits if controller isn't wake-up capable"
authorLu Baolu <baolu.lu@linux.intel.com>
Tue, 18 Nov 2014 09:27:13 +0000 (11:27 +0200)
committerBen Hutchings <ben@decadent.org.uk>
Sun, 14 Dec 2014 16:23:59 +0000 (16:23 +0000)
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>
drivers/usb/host/xhci-hub.c

Simple merge