Merge "usb: dwc3-msm: don't enable runtime PM until probe finishes" (0350165b) · Commits · e / devices / android_kernel_sony_msm8994

drivers/usb/dwc3/dwc3-msm.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -2501,9 +2501,6 @@ static int dwc3_msm_probe(struct platform_device *pdev)

	mdwc->io_res = res; /* used to calculate chg block offset */		mdwc->io_res = res; /* used to calculate chg block offset */

	pm_runtime_set_active(mdwc->dev);
	pm_runtime_enable(mdwc->dev);

	if (of_property_read_u32(node, "qcom,dwc-usb3-msm-dbm-eps",		if (of_property_read_u32(node, "qcom,dwc-usb3-msm-dbm-eps",
	&mdwc->dbm_num_eps)) {		&mdwc->dbm_num_eps)) {
	dev_err(&pdev->dev,		dev_err(&pdev->dev,
	@@ -2680,6 +2677,9 @@ static int dwc3_msm_probe(struct platform_device *pdev)
	pm_stay_awake(mdwc->dev);		pm_stay_awake(mdwc->dev);
	dwc3_msm_debugfs_init(mdwc);		dwc3_msm_debugfs_init(mdwc);

			pm_runtime_set_active(mdwc->dev);
			pm_runtime_enable(mdwc->dev);

	return 0;		return 0;

	put_dwc3:		put_dwc3: