Merge "disp: msm: fix probe deferral logic" (34df751b) · Commits · e / devices / android_kernel_fairphone_FP5

msm/msm_drv.c

+11 −4

Original line number	Diff line number	Diff line
		@@ -1952,9 +1952,16 @@ static int msm_drm_component_dependency_check(struct device *dev)

		if (of_node_name_eq(node,"qcom,sde_rscc") &&
		of_device_is_available(node) &&
		!of_node_check_flag(node, OF_POPULATED)) {
		dev_err(dev, "qcom,sde_rscc device not probed yet\n");
		of_node_check_flag(node, OF_POPULATED)) {
		struct platform_device *pdev =
		of_find_device_by_node(node);
		if (!platform_get_drvdata(pdev)) {
		dev_err(dev,
		"qcom,sde_rscc not probed yet\n");
		return -EPROBE_DEFER;
		} else {
		return 0;
		}
		}
		}