Merge "usb: dwc3-msm: Flush bus_vote_w work on pm_suspend and freeze" (78e9e371) · Commits · e / devices / android_kernel_sony_msm8998

drivers/usb/dwc3/dwc3-msm.c

+12 −6

Original line number	Diff line number	Diff line
		@@ -4059,10 +4059,13 @@ static int dwc3_msm_pm_suspend(struct device *dev)
		}

		ret = dwc3_msm_suspend(mdwc, false);
		if (!ret)
		if (ret)
		return ret;

		flush_work(&mdwc->bus_vote_w);
		atomic_set(&mdwc->pm_suspended, 1);

		return ret;
		return 0;
		}

		static int dwc3_msm_pm_freeze(struct device *dev)
		@@ -4091,10 +4094,13 @@ static int dwc3_msm_pm_freeze(struct device *dev)
		mdwc->hs_phy->flags &= ~PHY_HOST_MODE;

		ret = dwc3_msm_suspend(mdwc, true);
		if (!ret)
		if (ret)
		return ret;

		flush_work(&mdwc->bus_vote_w);
		atomic_set(&mdwc->pm_suspended, 1);

		return ret;
		return 0;
		}

		static int dwc3_msm_pm_resume(struct device *dev)