diff options
| author | Wei Yongjun <weiyongjun1@huawei.com> | 2017-10-11 13:36:56 +0200 |
|---|---|---|
| committer | Rob Clark <robdclark@gmail.com> | 2017-10-12 16:59:56 +0200 |
| commit | c9811d0fa55929b182f62e0ee49b71b0bea6a936 (patch) | |
| tree | a46d20541bab574dec847277e92d5e7a9ebb3959 /drivers/gpu | |
| parent | drm/msm: use proper memory barriers for updating tail/head (diff) | |
| download | linux-c9811d0fa55929b182f62e0ee49b71b0bea6a936.tar.xz linux-c9811d0fa55929b182f62e0ee49b71b0bea6a936.zip | |
drm/msm: fix return value check in _msm_gem_kernel_new()
In case of error, the function msm_gem_get_vaddr() returns ERR_PTR()
and never returns NULL. The NULL test in the return value check should
be replaced with IS_ERR().
Fixes: 8223286d62e2 ("drm/msm: Add a helper function for in-kernel
buffer allocations")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: Rob Clark <robdclark@gmail.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_gem.c | 4 |
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 f15821a0d900..0b338fbf97ce 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -1045,10 +1045,10 @@ static void *_msm_gem_kernel_new(struct drm_device *dev, uint32_t size, } vaddr = msm_gem_get_vaddr(obj); - if (!vaddr) { + if (IS_ERR(vaddr)) { msm_gem_put_iova(obj, aspace); drm_gem_object_unreference(obj); - return ERR_PTR(-ENOMEM); + return ERR_CAST(vaddr); } if (bo) |