summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/udl
diff options
context:
space:
mode:
authorHaixia Shi <hshi@chromium.org>2014-11-25 23:04:03 +0300
committerDave Airlie <airlied@redhat.com>2014-11-26 03:03:18 +0300
commite38648f95d197b2296dec4b8c1f9a163c362f31e (patch)
tree49c4c0363e3efdaade162d06a6575deb5abe3c61 /drivers/gpu/drm/udl
parent4bc158e0be4b03b320db9f3b91a84c898ae928a0 (diff)
downloadlinux-e38648f95d197b2296dec4b8c1f9a163c362f31e.tar.xz
drm/udl: properly check for error pointers
The drm_prime_pages_to_sg() function never returns NULL pointers, only error pointers and valid pointers. Signed-off-by: Haixia Shi <hshi@chromium.org> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/udl')
-rw-r--r--drivers/gpu/drm/udl/udl_dmabuf.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/udl/udl_dmabuf.c b/drivers/gpu/drm/udl/udl_dmabuf.c
index 2425b76dc44c..ac8a66b4dfc2 100644
--- a/drivers/gpu/drm/udl/udl_dmabuf.c
+++ b/drivers/gpu/drm/udl/udl_dmabuf.c
@@ -99,9 +99,9 @@ static struct sg_table *udl_map_dma_buf(struct dma_buf_attachment *attach,
page_count = obj->base.size / PAGE_SIZE;
obj->sg = drm_prime_pages_to_sg(obj->pages, page_count);
- if (!obj->sg) {
- DRM_ERROR("sg is null.\n");
- return ERR_PTR(-ENOMEM);
+ if (IS_ERR(obj->sg)) {
+ DRM_ERROR("failed to allocate sgt.\n");
+ return ERR_CAST(obj->sg);
}
sgt = &udl_attach->sgt;