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

Commit ebc6853d 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: fix type mismatches in memdesc_sg_virt()"

parents 61eb2471 ffbc8b82

drivers/gpu/msm/kgsl.c

+5 −2
Original line number Diff line number Diff line
@@ -2686,12 +2686,15 @@ static int check_vma(struct vm_area_struct *vma, struct file *vmfile, 


static int memdesc_sg_virt(struct kgsl_memdesc *memdesc, struct file *vmfile)

{

	int i, ret = 0;

	long npages = 0;

	int ret = 0;

	long npages = 0, i;

	unsigned long sglen = memdesc->size / PAGE_SIZE;

	struct page **pages = NULL;

	int write = (memdesc->flags & KGSL_MEMFLAGS_GPUREADONLY) != 0;



	if (sglen == 0 || sglen >= LONG_MAX)

		return -EINVAL;



	pages = kgsl_malloc(sglen * sizeof(struct page *));

	if (pages == NULL)

		return -ENOMEM;