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

Commit b3130349 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "xhci: Disable polling of shared hcd during suspend"

parents 20c45b29 8ec6f95f

drivers/usb/host/xhci.c

+4 −0
Original line number Diff line number Diff line
@@ -918,6 +918,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);
@@ -1119,6 +1121,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;

}