Commit 1f70e079 authored Sep 11, 2013 by Wei Yongjun Committed by Rob Clark Sep 11, 2013

drm/msm: fix return value check in ERR_PTR()



In case of error, the function drm_prime_pages_to_sg() returns ERR_PTR()
and never returns NULL. The NULL test in the return value check should
be replaced with IS_ERR().

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>

parent 19872533

drivers/gpu/drm/msm/msm_gem.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -40,9 +40,9 @@ static struct page *get_pages(struct drm_gem_object obj)
		}

		msm_obj->sgt = drm_prime_pages_to_sg(p, npages);
		if (!msm_obj->sgt) {
		if (IS_ERR(msm_obj->sgt)) {
		dev_err(dev->dev, "failed to allocate sgt\n");
		return ERR_PTR(-ENOMEM);
		return ERR_CAST(msm_obj->sgt);
		}

		msm_obj->pages = p;