Merge "USB: phy-msm-usb: Queue smwork from PM notify in device mode" (94274232) · Commits · e / devices / android_kernel_sony_msm8994

drivers/usb/phy/phy-msm-usb.c

+1 −10

Original line number	Original line	Diff line number	Diff line
	@@ -5146,8 +5146,6 @@ static int msm_otg_pm_resume(struct device *dev)
	dev_dbg(dev, "OTG PM resume\n");		dev_dbg(dev, "OTG PM resume\n");

	motg->pm_done = 0;		motg->pm_done = 0;
	if (!motg->host_bus_suspend)
	atomic_set(&motg->pm_suspended, 0);

	if (motg->async_int \|\| motg->sm_work_pending \|\|		if (motg->async_int \|\| motg->sm_work_pending \|\|
	!pm_runtime_suspended(dev)) {		!pm_runtime_suspended(dev)) {
	@@ -5159,14 +5157,7 @@ static int msm_otg_pm_resume(struct device *dev)
	pm_runtime_set_active(dev);		pm_runtime_set_active(dev);
	pm_runtime_enable(dev);		pm_runtime_enable(dev);

	/*		/* sm work will start in pm notify */
	* Defer any host mode disconnect events until
	* all devices are RESUMED
	*/
	if (motg->sm_work_pending && !motg->host_bus_suspend) {
	motg->sm_work_pending = false;
	queue_work(system_nrt_wq, &motg->sm_work);
	}
	}		}

	return ret;		return ret;