---

yaml --- r: 319421 b: refs/heads/master c: 56fb538 h: refs/heads/master i: 319419: e609116 v: v3
git-mirror · Jul 27, 2012 · 1771b0f · 1771b0f
1 parent ba86cc4
commit 1771b0f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9416dfa76ab418a2ba71ec1027f3c0af674d6e23
+refs/heads/master: 56fb5380c76d75d30b0e7acdfd36de34b4ee4375
diff --git a/trunk/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c b/trunk/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c
@@ -86,6 +86,10 @@ static struct sg_table *
 	npages = buf->size / buf->page_size;
 
 	sgt = exynos_pages_to_sg(buf->pages, npages, buf->page_size);
+	if (!sgt) {
+		DRM_DEBUG_PRIME("exynos_pages_to_sg returned NULL!\n");
+		goto err_unlock;
+	}
 	nents = dma_map_sg(attach->dev, sgt->sgl, sgt->nents, dir);
 
 	DRM_DEBUG_PRIME("npages = %d buffer size = 0x%lx page_size = 0x%lx\n",