summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2013-09-11 06:56:12 +0800
committerRob Clark <robdclark@gmail.com>2013-09-11 17:31:33 -0400
commit1f70e079c773b2c5988b0f0b4d314fc0f6c7a1b8 (patch)
tree5fa117c3854eeeeb23d749402e125312e67cf7c3
parent198725337ef1f73b73e7dc953c6ffb0799f26ffe (diff)
downloadop-kernel-dev-1f70e079c773b2c5988b0f0b4d314fc0f6c7a1b8.zip
op-kernel-dev-1f70e079c773b2c5988b0f0b4d314fc0f6c7a1b8.tar.gz
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>
-rw-r--r--drivers/gpu/drm/msm/msm_gem.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c
index df0390f..5999b67 100644
--- a/drivers/gpu/drm/msm/msm_gem.c
+++ b/drivers/gpu/drm/msm/msm_gem.c
@@ -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;
OpenPOWER on IntegriCloud