Merge "msm: vidc: Add conditional check to avoid invalid access" (d01df77b) · Commits · e / devices / android_kernel_oneplus_sm7250

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -1945,6 +1945,8 @@ static int __interface_queues_init(struct venus_hfi_device *dev)
		dev->sfr.align_virtual_addr = mem_addr->align_virtual_addr;
		dev->sfr.mem_size = ALIGNED_SFR_SIZE;
		dev->sfr.mem_data = mem_addr->mem_data;
		vsfr = (struct hfi_sfr_struct *) dev->sfr.align_virtual_addr;
		vsfr->bufSize = ALIGNED_SFR_SIZE;
		}

		q_tbl_hdr = (struct hfi_queue_table_header *)
		@@ -2004,8 +2006,6 @@ static int __interface_queues_init(struct venus_hfi_device *dev)
		}
		}

		vsfr = (struct hfi_sfr_struct *) dev->sfr.align_virtual_addr;
		vsfr->bufSize = ALIGNED_SFR_SIZE;

		if (dev->res->domain_cvp) {
		rc = __interface_dsp_queues_init(dev);