Skip to contentSkip to conversation

drm/v3d: fix a NULL vs error pointer mixup

PATCH In review Dan Carpenter 2 participants 2 messages Mar 21, 2019 – Mar 22, 2019

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.")
---
 drivers/gpu/drm/v3d/v3d_bo.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/v3d/v3d_bo.c +2 -2
index c0219ebb4284..a22b75a3a533 100644
@@ -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);
Signature · 1 line
2.17.1
#1 lore raw
Quoted 5 lines · Dan Carpenter

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.")

Sigh, error pointers are the worst.

Reviewed, and applying to drm-misc-next.