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

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

Merge "usb: xhci: Fix suspend/resume when used with OTG core"

parents 4c03e3a5 a0ab9470

drivers/usb/host/xhci-plat.c

+1 −0
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ static int xhci_plat_probe(struct platform_device *pdev) 
	hcd = platform_get_drvdata(pdev);

	xhci = hcd_to_xhci(hcd);

	xhci->clk = clk;

	xhci->main_hcd = hcd;

	xhci->shared_hcd = usb_create_shared_hcd(driver, &pdev->dev,

			dev_name(&pdev->dev), hcd);

	if (!xhci->shared_hcd) {

drivers/usb/host/xhci.c

+6 −6
Original line number Diff line number Diff line
@@ -670,12 +670,6 @@ static void xhci_only_stop_hcd(struct usb_hcd *hcd) 


	spin_lock_irq(&xhci->lock);

	xhci_halt(xhci);



	/* The shared_hcd is going to be deallocated shortly (the USB core only

	 * calls this function when allocation fails in usb_add_hcd(), or

	 * usb_remove_hcd() is called).  So we need to unset xHCI's pointer.

	 */

	xhci->shared_hcd = NULL;

	spin_unlock_irq(&xhci->lock);

}
@@ -907,6 +901,9 @@ int xhci_suspend(struct xhci_hcd *xhci, bool do_wakeup) 
	struct usb_hcd		*hcd = xhci_to_hcd(xhci);

	u32			command;



	if (!hcd->state)

		return 0;



	if (hcd->state != HC_STATE_SUSPENDED ||

			xhci->shared_hcd->state != HC_STATE_SUSPENDED)

		return -EINVAL;
@@ -993,6 +990,9 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated) 
	int			retval = 0;

	bool			comp_timer_running = false;



	if (!hcd->state)

		return 0;



	/* Wait a bit if either of the roothubs need to settle from the

	 * transition into bus suspend.

	 */