Skip to content

Commit

Permalink
drm/msm: fix return value check in ERR_PTR()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Wei Yongjun authored and Rob Clark committed Sep 11, 2013
1 parent 1987253 commit 1f70e07
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/gpu/drm/msm/msm_gem.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 1f70e07

Please sign in to comment.