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

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

Merge "msm: vidc: Check presence of property before calling cx register"

parents 53a8c2ab e0435f24

drivers/media/platform/msm/vidc/msm_vidc_res_parse.c

+5 −2
Original line number Diff line number Diff line
@@ -1137,8 +1137,11 @@ int read_platform_resources_from_dt( 
			"qcom,max-secure-instances",

			&res->max_secure_inst_count);



	res->cx_ipeak_context = cx_ipeak_register(pdev->dev.of_node,

			"qcom,cx-ipeak-data");

	if (of_find_property(pdev->dev.of_node,

			"qcom,cx-ipeak-data", NULL)) {

		res->cx_ipeak_context = cx_ipeak_register(

			pdev->dev.of_node, "qcom,cx-ipeak-data");

	}



	if (IS_ERR(res->cx_ipeak_context)) {

		rc = PTR_ERR(res->cx_ipeak_context);