Merge "gpu: ion: Return correct error code at alloc fail"

75ef47e4 · Linux Build Service Account · Gerrit - the friendly Code Review server · acd616a8 · 00fc192c · 75ef47e4
Commit 75ef47e4 authored 12 years ago by Linux Build Service Account Committed by Gerrit - the friendly Code Review server 12 years ago
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

drivers/gpu/ion/ion_iommu_heap.c drivers/gpu/ion/ion_iommu_heap.c +3 -1

No files found.
--- a/drivers/gpu/ion/ion_iommu_heap.c
+++ b/drivers/gpu/ion/ion_iommu_heap.c
@@ -82,8 +82,10 @@ static int ion_iommu_heap_allocate(struct ion_heap *heap,
 		for_each_sg(table->sgl, sg, table->nents, i) {
 			data->pages[i] = alloc_page(
 				GFP_KERNEL | __GFP_HIGHMEM);
-			if (!data->pages[i])
+			if (!data->pages[i]) {
+				ret = -ENOMEM;
 				goto err3;
+			}

 			sg_set_page(sg, data->pages[i], PAGE_SIZE, 0);
 			sg_dma_address(sg) = sg_phys(sg);