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

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

Merge "usb: core: Enable xhci irq after starting controller"

parents ba102138 8e2be717
Loading
Loading
Loading
Loading
+8 −0
Original line number Diff line number Diff line
@@ -138,7 +138,13 @@ static int xhci_start(struct xhci_hcd *xhci)
{
	u32 temp;
	int ret;
	struct usb_hcd *hcd = xhci_to_hcd(xhci);

	/*
	 * disable irq to avoid xhci_irq flooding due to unhandeled port
	 * change event in halt state, as soon as xhci_start clears halt bit
	 */
	disable_irq(hcd->irq);
	temp = readl(&xhci->op_regs->command);
	temp |= (CMD_RUN);
	xhci_dbg_trace(xhci, trace_xhci_dbg_init, "// Turn on HC, cmd = 0x%x.",
@@ -159,6 +165,8 @@ static int xhci_start(struct xhci_hcd *xhci)
		/* clear state flags. Including dying, halted or removing */
		xhci->xhc_state = 0;

	enable_irq(hcd->irq);

	return ret;
}