From 1771b0fc922a57c3cf63c30f3396b1993190c864 Mon Sep 17 00:00:00 2001 From: Subash Patel Date: Mon, 25 Jun 2012 11:22:56 -0700 Subject: [PATCH] --- yaml --- r: 319421 b: refs/heads/master c: 56fb5380c76d75d30b0e7acdfd36de34b4ee4375 h: refs/heads/master i: 319419: e6091161b7f84b17dbae5fe30c0feaad00fa411c v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f4884331ed12..30a3587c8780 100644 --- 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 index 274909271c36..cb29e474da8e 100644 --- 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",