summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/v3d
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2019-03-21 09:27:31 +0300
committerEric Anholt <eric@anholt.net>2019-04-01 09:33:38 -0700
commitfc0c77fcbfb7c8e022a0bd655eeb7fa5f9bb1684 (patch)
tree588ddd0495bae6eb39ffb543922896be6d11a2c7 /drivers/gpu/drm/v3d
parent181e5bf29e06bd8ade7ebc21de056b9dc866fcc2 (diff)
downloadtalos-op-linux-fc0c77fcbfb7c8e022a0bd655eeb7fa5f9bb1684.tar.gz
talos-op-linux-fc0c77fcbfb7c8e022a0bd655eeb7fa5f9bb1684.zip
drm/v3d: fix a NULL vs error pointer mixup
The drm_gem_shmem_create() returns error pointers and v3d_bo_create() is also supposed to return error pointers. Fixes: 40609d4820b2 ("drm/v3d: Use the new shmem helpers to reduce driver boilerplate.") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Eric Anholt <eric@anholt.net> Reviewed-by: Eric Anholt <eric@anholt.net> Link: https://patchwork.freedesktop.org/patch/msgid/20190321062731.GC21489@kadam
Diffstat (limited to 'drivers/gpu/drm/v3d')
-rw-r--r--drivers/gpu/drm/v3d/v3d_bo.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/v3d/v3d_bo.c b/drivers/gpu/drm/v3d/v3d_bo.c
index c0219ebb4284..a22b75a3a533 100644
--- a/drivers/gpu/drm/v3d/v3d_bo.c
+++ b/drivers/gpu/drm/v3d/v3d_bo.c
@@ -130,8 +130,8 @@ struct v3d_bo *v3d_bo_create(struct drm_device *dev, struct drm_file *file_priv,
int ret;
shmem_obj = drm_gem_shmem_create(dev, unaligned_size);
- if (!shmem_obj)
- return NULL;
+ if (IS_ERR(shmem_obj))
+ return ERR_CAST(shmem_obj);
bo = to_v3d_bo(&shmem_obj->base);
ret = v3d_bo_create_finish(&shmem_obj->base);
OpenPOWER on IntegriCloud