Merge "usb: dwc3: msm: initiate resume sequence in threaded irq handler" (5489ab89) · Commits · e / devices / android_kernel_sony_msm8994

drivers/usb/dwc3/dwc3-msm.c

+11 −6

Original line number	Diff line number	Diff line
		@@ -1967,8 +1967,12 @@ static void dwc3_pwr_event_handler(struct dwc3_msm *mdwc)
		static irqreturn_t msm_dwc3_pwr_irq_thread(int irq, void *_mdwc)
		{
		struct dwc3_msm *mdwc = _mdwc;
		struct dwc3 *dwc = platform_get_drvdata(mdwc->dwc3);

		dev_dbg(mdwc->dev, "%s\n", __func__);
		if (atomic_read(&dwc->in_lpm))
		pm_runtime_get_sync(&mdwc->dwc3->dev);
		else
		dwc3_pwr_event_handler(mdwc);
		return IRQ_HANDLED;
		}
		@@ -2098,11 +2102,12 @@ static irqreturn_t msm_dwc3_pwr_irq(int irq, void *data)
		* msm_resume after the clocks are enabled.
		*/
		atomic_set(&mdwc->in_p3, 0);
		/* bail out if system resume in process, else initiate RESUME */
		if (atomic_read(&mdwc->pm_suspended))

		/* Initate resume if system resume is not in process */
		if (!atomic_read(&mdwc->pm_suspended))
		return IRQ_WAKE_THREAD;

		mdwc->resume_pending = true;
		else
		pm_runtime_get(&mdwc->dwc3->dev);

		return IRQ_HANDLED;
		}