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

Commit 14e61a1b authored by Al Cooper's avatar Al Cooper Committed by Greg Kroah-Hartman
Browse files

usb: xhci_suspend is not stopping the root hub timer for the shared HCD 



V2 - Restart polling (which will restart the timer) for the shared
HCD in xhci_resume().

xhci_suspend() will stop the primary HCD's root hub timer, but leaves
the shared HCD's timer running. This change adds stopping of the
shared HCD timer.

Signed-off-by: default avatarAl Cooper <alcooperx@gmail.com>
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1e3452e3

drivers/usb/host/xhci.c

+4 −0
Original line number Diff line number Diff line
@@ -871,6 +871,8 @@ int xhci_suspend(struct xhci_hcd *xhci) 
	xhci_dbg(xhci, "%s: stopping port polling.\n", __func__);

	clear_bit(HCD_FLAG_POLL_RH, &hcd->flags);

	del_timer_sync(&hcd->rh_timer);

	clear_bit(HCD_FLAG_POLL_RH, &xhci->shared_hcd->flags);

	del_timer_sync(&xhci->shared_hcd->rh_timer);



	spin_lock_irq(&xhci->lock);

	clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
@@ -1075,6 +1077,8 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated) 
	xhci_dbg(xhci, "%s: starting port polling.\n", __func__);

	set_bit(HCD_FLAG_POLL_RH, &hcd->flags);

	usb_hcd_poll_rh_status(hcd);

	set_bit(HCD_FLAG_POLL_RH, &xhci->shared_hcd->flags);

	usb_hcd_poll_rh_status(xhci->shared_hcd);



	return retval;

}