On Fri, Nov 14, 2014 at 07:23:51PM +0200, Mathias Nyman wrote:
> From: Lu Baolu <baolu.lu@xxxxxxxxxxxxxxx>
>
> 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.
how far back ? Aparently 2.6.37+
> Cc: stable <stable@xxxxxxxxxxxxxxx>
> Signed-off-by: Lu Baolu <baolu.lu@xxxxxxxxxxxxxxx>
> Reported-by: Dmitry Nezhevenko <dion@xxxxxxxxx>
> [Mathias Nyman: reword commit message]
> Signed-off-by: Mathias Nyman <mathias.nyman@xxxxxxxxxxxxxxx>
> ---
> drivers/usb/host/xhci-hub.c | 5 +----
> 1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c
> index 696160d..388cfd8 100644
> --- a/drivers/usb/host/xhci-hub.c
> +++ b/drivers/usb/host/xhci-hub.c
> @@ -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;
> --
> 1.8.3.2
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-usb" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
balbi
Attachment:
signature.asc
Description: Digital signature