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

Commit 8e843fce authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm/sde/rotator: add check for vbif dt properties"

parents 0b1e51d0 3df2dc8f

drivers/media/platform/msm/sde/rotator/sde_rotator_base.c

+2 −2
Original line number Diff line number Diff line
@@ -554,7 +554,7 @@ static void sde_mdp_parse_vbif_memtype(struct platform_device *pdev, 
			"qcom,mdss-rot-vbif-memtype");

	mdata->vbif_memtype = kcalloc(mdata->vbif_memtype_count,

			sizeof(u32), GFP_KERNEL);

	if (!mdata->vbif_memtype) {

	if (!mdata->vbif_memtype || !mdata->vbif_memtype_count) {

		mdata->vbif_memtype_count = 0;

		return;

	}
@@ -582,7 +582,7 @@ static void sde_mdp_parse_vbif_qos(struct platform_device *pdev, 
			"qcom,mdss-rot-vbif-qos-setting");

	mdata->vbif_nrt_qos = kcalloc(mdata->npriority_lvl,

			sizeof(u32), GFP_KERNEL);

	if (!mdata->vbif_nrt_qos) {

	if (!mdata->vbif_nrt_qos || !mdata->npriority_lvl) {

		mdata->npriority_lvl = 0;

		return;

	}