Merge "usb: host: Fix unclocked access in xhci_suspend in case of pm suspend" (756bbb25) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/usb/host/xhci.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -1013,13 +1013,13 @@ int xhci_suspend(struct xhci_hcd *xhci, bool do_wakeup)
		xhci->shared_hcd->state != HC_STATE_SUSPENDED)
		return -EINVAL;

		if (!HCD_HW_ACCESSIBLE(hcd))
		return 0;

		/* Clear root port wake on bits if wakeup not allowed. */
		xhci_disable_hub_port_wake(xhci, &xhci->usb3_rhub, do_wakeup);
		xhci_disable_hub_port_wake(xhci, &xhci->usb2_rhub, do_wakeup);

		if (!HCD_HW_ACCESSIBLE(hcd))
		return 0;

		xhci_dbc_suspend(xhci);

		/* Don't poll the roothubs on bus suspend. */