Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e3d88f9 authored by YoungJun Cho's avatar YoungJun Cho Committed by Dave Airlie
Browse files

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: default avatarYoungJun Cho <yj44.cho@samsung.com>
Signed-off-by: default avatarSeung-Woo Kim <sw0312.kim@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent b720d54a

drivers/gpu/drm/drm_prime.c

+5 −3
Original line number Original line Diff line number Diff line
@@ -97,7 +97,7 @@ static struct sg_table *drm_gem_map_dma_buf(struct dma_buf_attachment *attach, 




	sgt = obj->dev->driver->gem_prime_get_sg_table(obj);

	sgt = obj->dev->driver->gem_prime_get_sg_table(obj);





	if (!IS_ERR_OR_NULL(sgt)) {

	if (!IS_ERR(sgt)) {

		if (!dma_map_sg(attach->dev, sgt->sgl, sgt->nents, dir)) {

		if (!dma_map_sg(attach->dev, sgt->sgl, sgt->nents, dir)) {

			sg_free_table(sgt);

			sg_free_table(sgt);

			kfree(sgt);

			kfree(sgt);
@@ -437,8 +437,10 @@ struct sg_table *drm_prime_pages_to_sg(struct page **pages, int nr_pages) 
	int ret;

	int ret;





	sg = kmalloc(sizeof(struct sg_table), GFP_KERNEL);

	sg = kmalloc(sizeof(struct sg_table), GFP_KERNEL);

	if (!sg)

	if (!sg) {

		ret = -ENOMEM;

		goto out;

		goto out;

	}





	ret = sg_alloc_table_from_pages(sg, pages, nr_pages, 0,

	ret = sg_alloc_table_from_pages(sg, pages, nr_pages, 0,

				nr_pages << PAGE_SHIFT, GFP_KERNEL);

				nr_pages << PAGE_SHIFT, GFP_KERNEL);
@@ -448,7 +450,7 @@ struct sg_table *drm_prime_pages_to_sg(struct page **pages, int nr_pages) 
	return sg;

	return sg;

out:

out:

	kfree(sg);

	kfree(sg);

	return NULL;

	return ERR_PTR(ret);

}

}

EXPORT_SYMBOL(drm_prime_pages_to_sg);

EXPORT_SYMBOL(drm_prime_pages_to_sg);