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

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

Merge "USB: dwc3: msm: Kill tasklet before disabling irq in suspend"

parents 8a71ee88 9a72294c

drivers/usb/dwc3/dwc3-msm.c

+1 −0
Original line number Diff line number Diff line
@@ -1965,6 +1965,7 @@ static int dwc3_msm_suspend(struct dwc3_msm *mdwc) 
	can_suspend_ssphy = !(mdwc->in_host_mode &&

				dwc3_msm_is_host_superspeed(mdwc));



	tasklet_kill(&dwc->bh);

	/* Disable core irq */

	if (dwc->irq)

		disable_irq(dwc->irq);

drivers/usb/dwc3/gadget.c

+0 −2
Original line number Diff line number Diff line
@@ -3515,7 +3515,6 @@ static void dwc3_interrupt_bh(unsigned long param) 
{

	struct dwc3 *dwc = (struct dwc3 *) param;



	pm_runtime_get(dwc->dev);

	dwc3_thread_interrupt(dwc->irq, dwc);

	enable_irq(dwc->irq);

}
@@ -3543,7 +3542,6 @@ static irqreturn_t dwc3_thread_interrupt(int irq, void *_dwc) 
	dwc->bh_completion_time[dwc->bh_dbg_index] = temp_time;

	dwc->bh_dbg_index = (dwc->bh_dbg_index + 1) % 10;



	pm_runtime_put(dwc->dev);

	return ret;

}