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

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

Merge "msm: ipa3: Fix IPA SMMU devices prob order" into msm-4.9

parents 3be52aa9 115bf8ab

drivers/platform/msm/ipa/ipa_v3/ipa.c

+7 −7
Original line number Diff line number Diff line
@@ -5528,13 +5528,6 @@ int ipa3_plat_drv_probe(struct platform_device *pdev_p, 
		return result;

	}



	result = of_platform_populate(pdev_p->dev.of_node,

		pdrv_match, NULL, &pdev_p->dev);

	if (result) {

		IPAERR("failed to populate platform\n");

		return result;

	}



	if (of_property_read_bool(pdev_p->dev.of_node, "qcom,arm-smmu")) {

		if (of_property_read_bool(pdev_p->dev.of_node,

		    "qcom,smmu-s1-bypass"))
@@ -5580,6 +5573,13 @@ int ipa3_plat_drv_probe(struct platform_device *pdev_p, 
		}

	}



	result = of_platform_populate(pdev_p->dev.of_node,

		pdrv_match, NULL, &pdev_p->dev);

	if (result) {

		IPAERR("failed to populate platform\n");

		return result;

	}



	return result;

}