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

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

Merge "msm: kgsl: Release firmware if allocating GPU space fails at init"

parents 336c588b e1fac91a

drivers/gpu/msm/adreno_a5xx.c

+4 −3
Original line number Diff line number Diff line
@@ -1933,19 +1933,20 @@ static int _load_firmware(struct adreno_device *adreno_dev, const char *fwfile, 
		return ret;

	}



	ret = kgsl_allocate_global(device, ucode, fw->size,

	ret = kgsl_allocate_global(device, ucode, fw->size - 4,

				KGSL_MEMFLAGS_GPUREADONLY, 0);



	if (ret)

		return ret;

		goto done;



	memcpy(ucode->hostptr, &fw->data[4], fw->size - 4);

	*ucode_size = (fw->size - 4) / sizeof(uint32_t);

	*ucode_version = *(unsigned int *)&fw->data[4];



done:

	release_firmware(fw);



	return 0;

	return ret;

}



/*