Skip to contentSkip to conversation

drm/vboxvideo: fix a NULL vs IS_ERR() check

PATCH In review Dan Carpenter 2 participants 2 messages Nov 18, 2021

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

PATCH 1/1 drm/vboxvideo: fix a NULL vs IS_ERR() check

The devm_gen_pool_create() function never returns NULL, it returns error pointers.

Fixes 4cc9b565454b ("drm/vboxvideo: Use devm_gen_pool_create")
---
 drivers/gpu/drm/vboxvideo/vbox_main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/vboxvideo/vbox_main.c +2 -2
index f28779715ccd..c9e8b3a63c62 100644
@@ -127,8 +127,8 @@ int vbox_hw_init(struct vbox_private *vbox)
 	/* Create guest-heap mem-pool use 2^4 = 16 byte chunks */
 	vbox->guest_pool = devm_gen_pool_create(vbox->ddev.dev, 4, -1,
 						"vboxvideo-accel");
-	if (!vbox->guest_pool)
-		return -ENOMEM;
+	if (IS_ERR(vbox->guest_pool))
+		return PTR_ERR(vbox->guest_pool);
 
 	ret = gen_pool_add_virt(vbox->guest_pool,
 				(unsigned long)vbox->guest_heap,
Signature · 1 line
2.20.1
Reviewed-by on v1 1/1
#1 lore raw

Hi,

Quoted 5 lines · Dan Carpenter

The devm_gen_pool_create() function never returns NULL, it returns error pointers.

Fixes 4cc9b565454b ("drm/vboxvideo: Use devm_gen_pool_create")

Thanks, patch looks good to me:

I will go and push this to drm-misc-next right away.

Regards,

Hans

Quoted 20 lines
---
 drivers/gpu/drm/vboxvideo/vbox_main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/vboxvideo/vbox_main.c +2 -2
index f28779715ccd..c9e8b3a63c62 100644
@@ -127,8 +127,8 @@ int vbox_hw_init(struct vbox_private *vbox)
 	/* Create guest-heap mem-pool use 2^4 = 16 byte chunks */
 	vbox->guest_pool = devm_gen_pool_create(vbox->ddev.dev, 4, -1,
 						"vboxvideo-accel");
-	if (!vbox->guest_pool)
-		return -ENOMEM;
+	if (IS_ERR(vbox->guest_pool))
+		return PTR_ERR(vbox->guest_pool);
 
 	ret = gen_pool_add_virt(vbox->guest_pool,
 				(unsigned long)vbox->guest_heap,