Merge "drm/msm/sde: fix memory leak during hardware catalog init" (4f3db128) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/gpu/drm/msm/sde/sde_hw_catalog.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -3427,15 +3427,17 @@ static int sde_parse_merge_3d_dt(struct device_node *np,
		rc = _validate_dt_entry(np, merge_3d_prop, ARRAY_SIZE(merge_3d_prop),
		prop_count, &off_count);
		if (rc)
		goto error;
		goto end;

		sde_cfg->merge_3d_count = off_count;

		rc = _read_dt_entry(np, merge_3d_prop, ARRAY_SIZE(merge_3d_prop),
		prop_count,
		prop_exists, prop_value);
		if (rc)
		goto error;
		if (rc) {
		sde_cfg->merge_3d_count = 0;
		goto end;
		}

		for (i = 0; i < off_count; i++) {
		merge_3d = sde_cfg->merge_3d + i;
		@@ -3446,9 +3448,7 @@ static int sde_parse_merge_3d_dt(struct device_node *np,
		merge_3d->len = PROP_VALUE_ACCESS(prop_value, HW_LEN, 0);
		}

		return 0;
		error:
		sde_cfg->merge_3d_count = 0;
		end:
		kfree(prop_value);
		fail:
		return rc;