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

Commit 33933d2f 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: Bail out if ocmem allocation failed"

parents 822e092c 67cd9eb9

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

+2 −2
Original line number Diff line number Diff line
@@ -3130,14 +3130,14 @@ static int venus_hfi_alloc_ocmem(void *dev, unsigned long size) 
		return -EINVAL;

	}

	ocmem_buffer = device->resources.ocmem.buf;

	if (!ocmem_buffer ||

		ocmem_buffer->len < size) {

	if (!ocmem_buffer || ocmem_buffer->len < size) {

		ocmem_buffer = ocmem_allocate(OCMEM_VIDEO, size);

		if (IS_ERR_OR_NULL(ocmem_buffer)) {

			dprintk(VIDC_ERR,

				"ocmem_allocate_nb failed: %d\n",

				(u32) ocmem_buffer);

			rc = -ENOMEM;

			goto ocmem_set_failed;

		}

		device->resources.ocmem.buf = ocmem_buffer;

		rc = venus_hfi_set_ocmem(device, ocmem_buffer);