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

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

Merge "usb: ehci-msm: Fix host mode HUB resume issue"

parents 4edbeb40 5162e7d8

drivers/usb/host/ehci-msm.c

+5 −0
Original line number Diff line number Diff line
@@ -219,6 +219,7 @@ static int ehci_msm_pm_resume(struct device *dev) 
{

	struct usb_hcd *hcd = dev_get_drvdata(dev);

	int ret;

	u32 portsc;



	dev_dbg(dev, "ehci-msm PM resume\n");

	if (!hcd->rh_registered)
@@ -230,6 +231,10 @@ static int ehci_msm_pm_resume(struct device *dev) 
		return ret;



	ehci_resume(hcd, false);

	portsc = readl_relaxed(USB_PORTSC);

	portsc &= ~PORT_RWC_BITS;

	portsc |= PORT_RESUME;

	writel_relaxed(portsc, USB_PORTSC);

	/* Resume root-hub to handle USB event if any else initiate LPM again */

	usb_hcd_resume_root_hub(hcd);