Merge "msm: kgsl: Correctly handle page allocation failure" (bc9b47da) · Commits · e / devices / android_kernel_sony_msm8994

drivers/gpu/msm/kgsl_sharedmem.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -402,7 +402,7 @@ static void kgsl_page_alloc_free(struct kgsl_memdesc *memdesc)
		/* we certainly do not expect the hostptr to still be mapped */
		BUG_ON(memdesc->hostptr);

		if (memdesc->sg)
		if (sglen && memdesc->sg)
		for_each_sg(memdesc->sg, sg, sglen, i)
		__free_pages(sg_page(sg), get_order(sg->length));
		}
		@@ -691,6 +691,8 @@ _kgsl_sharedmem_page_alloc(struct kgsl_memdesc *memdesc,
		*/
		memdesc->sglen = sglen;
		memdesc->size = (size - len);

		if (sglen > 0)
		sg_mark_end(&memdesc->sg[sglen - 1]);

		KGSL_CORE_ERR(