aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYoungJun Cho <yj44.cho@samsung.com>2013-06-24 03:40:53 -0400
committerDave Airlie <airlied@redhat.com>2013-06-27 22:45:19 -0400
commit7e3d88f9cce3ea3350fa25b89393a6dd2b8e5ed4 (patch)
treead5d9a4315187e36d930003e18bbd45655b43b31
parentb720d54a5caf077011f0dc6ba7792866d2828d16 (diff)
drm/prime: replace NULL with error value in drm_prime_pages_to_sg
Instead of NULL, error value is casted with ERR_PTR() for drm_prime_pages_to_sg() and IS_ERR_OR_NULL() macro is replaced with IS_ERR() macro for drm_gem_map_dma_buf(). Signed-off-by: YoungJun Cho <yj44.cho@samsung.com> Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/drm_prime.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c
index 0daf2122a91d..4ad2c45090b3 100644
--- a/drivers/gpu/drm/drm_prime.c
+++ b/drivers/gpu/drm/drm_prime.c
@@ -97,7 +97,7 @@ static struct sg_table *drm_gem_map_dma_buf(struct dma_buf_attachment *attach,
97 97
98 sgt = obj->dev->driver->gem_prime_get_sg_table(obj); 98 sgt = obj->dev->driver->gem_prime_get_sg_table(obj);
99 99
100 if (!IS_ERR_OR_NULL(sgt)) { 100 if (!IS_ERR(sgt)) {
101 if (!dma_map_sg(attach->dev, sgt->sgl, sgt->nents, dir)) { 101 if (!dma_map_sg(attach->dev, sgt->sgl, sgt->nents, dir)) {
102 sg_free_table(sgt); 102 sg_free_table(sgt);
103 kfree(sgt); 103 kfree(sgt);
@@ -437,8 +437,10 @@ struct sg_table *drm_prime_pages_to_sg(struct page **pages, int nr_pages)
437 int ret; 437 int ret;
438 438
439 sg = kmalloc(sizeof(struct sg_table), GFP_KERNEL); 439 sg = kmalloc(sizeof(struct sg_table), GFP_KERNEL);
440 if (!sg) 440 if (!sg) {
441 ret = -ENOMEM;
441 goto out; 442 goto out;
443 }
442 444
443 ret = sg_alloc_table_from_pages(sg, pages, nr_pages, 0, 445 ret = sg_alloc_table_from_pages(sg, pages, nr_pages, 0,
444 nr_pages << PAGE_SHIFT, GFP_KERNEL); 446 nr_pages << PAGE_SHIFT, GFP_KERNEL);
@@ -448,7 +450,7 @@ struct sg_table *drm_prime_pages_to_sg(struct page **pages, int nr_pages)
448 return sg; 450 return sg;
449out: 451out:
450 kfree(sg); 452 kfree(sg);
451 return NULL; 453 return ERR_PTR(ret);
452} 454}
453EXPORT_SYMBOL(drm_prime_pages_to_sg); 455EXPORT_SYMBOL(drm_prime_pages_to_sg);
454 456